Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2008-03-06 22:10:42 -0500
committerPascal Rapicault2008-03-06 22:10:42 -0500
commit15cb3b4a078da7e25c5ec33c68262dfe20eed79d (patch)
treeb1acff8d3737bab3a2f8331935c8a49c33594c6a /bundles/org.eclipse.equinox.frameworkadmin.equinox/src
parent0e43693c24472e828357f45391d5c3d5eeff19e0 (diff)
downloadrt.equinox.p2-15cb3b4a078da7e25c5ec33c68262dfe20eed79d.tar.gz
rt.equinox.p2-15cb3b4a078da7e25c5ec33c68262dfe20eed79d.tar.xz
rt.equinox.p2-15cb3b4a078da7e25c5ec33c68262dfe20eed79d.zip
Bug 221706 - Eclipse can't start when working dir is not set to the install folder
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox/src')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
index bb62a62ee..8d9875c0e 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
@@ -271,6 +271,14 @@ public class EclipseLauncherParser {
resolveNextLine = null;
} else {
resolveNextLine = needsPathResolution(lines[i], osgiInstallArea, launcherData.getLauncher().getParentFile().getAbsolutePath() + File.separator);
+ //We don't write -configuration when it is the default value
+ if (resolveNextLine != null && EquinoxConstants.OPTION_CONFIGURATION.equalsIgnoreCase(lines[i])) {
+ if ("configuration".equals(EquinoxManipulatorImpl.makeRelative(lines[i + 1], resolveNextLine))) { //$NON-NLS-1$
+ i++;
+ resolveNextLine = null;
+ continue;
+ }
+ }
}
bw.write(lines[i]);
bw.newLine();

Back to the top