Fixed relative path problem because cfg line contained an extra slash in the URL.

1 files changed, 7 insertions, 2 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java
index ce7804e33..667d4b0e7 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java
@@ -102,8 +102,13 @@ public class EquinoxFwConfigFileParser {
 				e.printStackTrace();
 			}
 			String fwJarSt = fwJarUrl.toExternalForm();
-			if (fwJarSt.length() > 5 && fwJarSt.charAt(4) != '/') {
-				fwJarSt = "file:/" + fwJarUrl.getFile();
+			// TODO I just added this "if" stmt because we were seeing an extra slash
+			// appearing in the resulting URL. was this the right thing to do? the indexes 
+			// seem off in the loop below. (I'm on linux if that makes a difference)
+			if (!fwJarSt.startsWith("file:")) {
+				if (fwJarSt.length() > 5 && fwJarSt.charAt(4) != '/') {
+					fwJarSt = "file:/" + fwJarUrl.getFile();
+				}
 			}
 			props.setProperty(EquinoxConstants.PROP_OSGI_FW, fwJarSt /* fwJar.getAbsolutePath() */);
 		}