Bug 443595 - osgi.framework.useSystemProperties is not set correctly in
the configuration if it is set using VM system properties
Change-Id: I59e9ed1907e1666c4b6bbd9741d4034c70353ff7
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index f63d2c9..7961a73 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -187,12 +187,8 @@
configuration = new HashMap<String, String>();
// TODO hack to set these to defaults for EclipseStarter
// Note that this hack does not allow these properties to be specified in config.ini
- if (System.getProperty(EquinoxConfiguration.PROP_USE_SYSTEM_PROPERTIES) == null) {
- configuration.put(EquinoxConfiguration.PROP_USE_SYSTEM_PROPERTIES, "true"); //$NON-NLS-1$
- }
- if (System.getProperty(EquinoxConfiguration.PROP_COMPATIBILITY_BOOTDELEGATION) == null) {
- configuration.put(EquinoxConfiguration.PROP_COMPATIBILITY_BOOTDELEGATION, "true"); //$NON-NLS-1$
- }
+ configuration.put(EquinoxConfiguration.PROP_USE_SYSTEM_PROPERTIES, System.getProperty(EquinoxConfiguration.PROP_USE_SYSTEM_PROPERTIES, "true")); //$NON-NLS-1$
+ configuration.put(EquinoxConfiguration.PROP_COMPATIBILITY_BOOTDELEGATION, System.getProperty(EquinoxConfiguration.PROP_COMPATIBILITY_BOOTDELEGATION, "true")); //$NON-NLS-1$
}
return configuration;
}
