aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-01-28 15:22:23 (EST)
committerPascal Rapicault2013-01-28 15:22:23 (EST)
commit24ca1bf5477ce264c7ed40c57dce658c83fe8979 (patch)
tree84d87ea78233fd9c39e4cd10bbd85f3fcf0b758d
parenta2fe32a99332a3e1c07871d9fee621d3a65a64f4 (diff)
downloadrt.equinox.framework-24ca1bf5477ce264c7ed40c57dce658c83fe8979.zip
rt.equinox.framework-24ca1bf5477ce264c7ed40c57dce658c83fe8979.tar.gz
rt.equinox.framework-24ca1bf5477ce264c7ed40c57dce658c83fe8979.tar.bz2
Don't read the config.ini when the launcher has detected that it has changed.
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index 5783d5a..bb88a94 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -109,6 +109,7 @@ public class EclipseStarter {
public static final String PROP_FRAMEWORK_SHAPE = "osgi.framework.shape"; //$NON-NLS-1$ //the shape of the fwk (jar, or folder)
public static final String PROP_NOSHUTDOWN = "osgi.noShutdown"; //$NON-NLS-1$
private static final String PROP_FORCED_RESTART = "osgi.forcedRestart"; //$NON-NLS-1$
+ private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
public static final String PROP_EXITCODE = "eclipse.exitcode"; //$NON-NLS-1$
public static final String PROP_EXITDATA = "eclipse.exitdata"; //$NON-NLS-1$
@@ -1127,6 +1128,8 @@ public class EclipseStarter {
}
private static void loadConfigurationInfo() {
+ if (Boolean.TRUE.toString().equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION)))
+ return;
Location configArea = LocationManager.getConfigurationLocation();
if (configArea == null)
return;