Bug 441377 - prevent NPE when configuration initialConfiguration map is
null
Change-Id: I42bf473592460e167776061b6e468b949c571f79
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 b918038..1598874 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
@@ -204,7 +204,7 @@
boolean useSystemProps = useSystemPropsValue == null ? false : Boolean.parseBoolean(useSystemPropsValue.toString());
this.configuration = useSystemProps ? System.getProperties() : new Properties();
// do this the hard way to handle null values
- for (Map.Entry<String, ?> initialEntry : initialConfiguration.entrySet()) {
+ for (Map.Entry<String, ?> initialEntry : this.initialConfig.entrySet()) {
if (initialEntry.getValue() == null) {
this.configuration.put(initialEntry.getKey(), NULL_CONFIG);
} else {
