fix a bug where we where using the wrong properties map.
@@ -328,28 +328,28 @@ class ExtensionManager implements Content
}
}
}
+
+ for (Map.Entry entry : defaultProperties.entrySet())
+ {
+ if (!config.containsKey(entry.getKey()))
+ {
+ config.put(entry.getKey(), entry.getValue());
+ }
+ }
+
if(sysprops != null && "true".equalsIgnoreCase(felix._getProperty(FelixConstants.USE_PROPERTY_SUBSTITUTION_IN_SYSTEMPACKAGES)) )
{
- defaultProperties.put(Constants.FRAMEWORK_SYSTEMPACKAGES, sysprops);
- config.put(Constants.FRAMEWORK_SYSTEMPACKAGES, Util.getPropertyWithSubs(defaultProperties, Constants.FRAMEWORK_SYSTEMPACKAGES));
+ config.put(Constants.FRAMEWORK_SYSTEMPACKAGES, Util.getPropertyWithSubs(Util.toProperties(config), Constants.FRAMEWORK_SYSTEMPACKAGES));
}
else if (sysprops == null)
{
- config.put(Constants.FRAMEWORK_SYSTEMPACKAGES, Util.getPropertyWithSubs(defaultProperties, Constants.FRAMEWORK_SYSTEMPACKAGES));
+ config.put(Constants.FRAMEWORK_SYSTEMPACKAGES, Util.getPropertyWithSubs(Util.toProperties(config), Constants.FRAMEWORK_SYSTEMPACKAGES));
}
String syscaps = felix._getProperty(Constants.FRAMEWORK_SYSTEMCAPABILITIES);
if(syscaps == null)
{
- config.put(Constants.FRAMEWORK_SYSTEMCAPABILITIES, Util.getPropertyWithSubs(defaultProperties, Constants.FRAMEWORK_SYSTEMCAPABILITIES));
- }
-
- for (Map.Entry entry : defaultProperties.entrySet())
- {
- if (!config.containsKey(entry.getKey()))
- {
- config.put(entry.getKey(), entry.getValue());
- }
+ config.put(Constants.FRAMEWORK_SYSTEMCAPABILITIES, Util.getPropertyWithSubs(Util.toProperties(config), Constants.FRAMEWORK_SYSTEMCAPABILITIES));
}
m_systemBundleRevision.update(config);
