diff options
| author | Thomas Watson | 2014-09-09 13:14:42 +0000 |
|---|---|---|
| committer | Thomas Watson | 2014-09-09 13:14:42 +0000 |
| commit | 3dd89db8e7e0a3f5f17541166560c3216fa5688e (patch) | |
| tree | 9c3cfc090bec9bb69b8e2815a877e6623b66beaa | |
| parent | 350046a78f5034000094aa52eaf46221fdd1be5b (diff) | |
| download | rt.equinox.framework-3dd89db8e7e0a3f5f17541166560c3216fa5688e.tar.gz rt.equinox.framework-3dd89db8e7e0a3f5f17541166560c3216fa5688e.tar.xz rt.equinox.framework-3dd89db8e7e0a3f5f17541166560c3216fa5688e.zip | |
Bug 443595 - osgi.framework.useSystemProperties is not set correctly inI20140915-0800I20140914-2000I20140909-1315I20140909-1115I20140909-1000
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.java | 8 |
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; } |