### Eclipse Workspace Patch 1.0 #P org.eclipse.help.base Index: src/org/eclipse/help/internal/base/BaseHelpSystem.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java,v retrieving revision 1.57 diff -u -r1.57 BaseHelpSystem.java --- src/org/eclipse/help/internal/base/BaseHelpSystem.java 21 Nov 2008 22:23:17 -0000 1.57 +++ src/org/eclipse/help/internal/base/BaseHelpSystem.java 22 Jul 2010 16:46:14 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -210,7 +210,8 @@ public static URL resolve(String href, String servlet) { String url = null; - if (href == null || href.indexOf("://") != -1) { //$NON-NLS-1$ + if (href == null || href.indexOf("://") != -1 //$NON-NLS-1$ + || isFileProtocol(href)) { url = href; } else { @@ -231,6 +232,11 @@ } } + private static boolean isFileProtocol(String href) { + int index = href.indexOf("file:"); //$NON-NLS-1$ + return ( index == 0 || index == 1 ); + } + public static String unresolve(URL url) { return unresolve(url.toString()); } #P org.eclipse.help.webapp Index: src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java,v retrieving revision 1.22 diff -u -r1.22 EclipseConnector.java --- src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java 22 Jun 2010 17:39:42 -0000 1.22 +++ src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java 22 Jul 2010 16:46:16 -0000 @@ -92,8 +92,7 @@ return; } String lowerCaseuRL = url.toLowerCase(Locale.ENGLISH); - if (lowerCaseuRL.startsWith("file:") //$NON-NLS-1$ - || lowerCaseuRL.startsWith("jar:") //$NON-NLS-1$ + if (lowerCaseuRL.startsWith("jar:") //$NON-NLS-1$ || lowerCaseuRL.startsWith("platform:")) { //$NON-NLS-1$ int i = url.indexOf('?'); if (i != -1)