Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java19
1 files changed, 2 insertions, 17 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index 2fe2a0ebb..a196d2574 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2013 IBM Corporation and others.
+ * Copyright (c) 2003, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -197,22 +197,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
Object useSystemPropsValue = initialConfig.get(PROP_USE_SYSTEM_PROPERTIES);
boolean useSystemProps = useSystemPropsValue == null ? false : Boolean.parseBoolean(useSystemPropsValue.toString());
this.configuration = useSystemProps ? System.getProperties() : new Properties();
- if (useSystemProps) {
- // system properties override initial configuration
- for (Map.Entry<String, Object> configEntry : initialConfig.entrySet()) {
- if (!this.configuration.containsKey(configEntry.getKey())) {
- this.configuration.put(configEntry.getKey(), configEntry.getValue());
- } else {
- // override the initial config value
- Object systemValue = this.configuration.get(configEntry.getKey());
- if (systemValue != null) {
- configEntry.setValue(systemValue);
- }
- }
- }
- } else {
- this.configuration.putAll(initialConfig);
- }
+ this.configuration.putAll(initialConfig);
initializeProperties(this.configuration, aliasMapper);
for (String initialKey : populateInitConfig) {

Back to the top