Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-09-09 13:14:42 +0000
committerThomas Watson2014-09-09 16:33:12 +0000
commitec8d374e48d723d61ff297fd61a1c19304b8815a (patch)
treefe6a6d4ffcc4c032f2e04ade4a9c86263b51443b
parent426e46d270ffe048509f2a57127ad9ae4ac27828 (diff)
downloadrt.equinox.framework-ec8d374e48d723d61ff297fd61a1c19304b8815a.tar.gz
rt.equinox.framework-ec8d374e48d723d61ff297fd61a1c19304b8815a.tar.xz
rt.equinox.framework-ec8d374e48d723d61ff297fd61a1c19304b8815a.zip
Bug 443595 - osgi.framework.useSystemProperties is not set correctly inR4_4_1M20141015-0800M20140925-0400M20140910-2310M20140910-0900
the configuration if it is set using VM system properties Change-Id: I59e9ed1907e1666c4b6bbd9741d4034c70353ff7 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java8
1 files changed, 2 insertions, 6 deletions
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 f63d2c961..7961a7367 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 @@ public class EclipseStarter {
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;
}

Back to the top