diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:14 +0200 |
| commit | 0f565573fb5a32f5eb3cd72baf4d69717bb4b991 (patch) | |
| tree | 4619c98cc61d682270fbd08d3c9faaf634507008 /java/src | |
| parent | Merge remote-tracking branch 'origin/master' into encoding11 (diff) | |
| parent | Also fixed property cloning for defaults properties (diff) | |
| download | ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.tar.bz2 ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.tar.xz ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index caaf2603a15..ff76acfb62e 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -457,7 +457,15 @@ public final class PropertiesI implements Properties { if(defaults != null) { - _properties = new java.util.HashMap<String, PropertyValue>(((PropertiesI)defaults)._properties); + // + // NOTE: we can't just do a shallow copy of the map as the map values + // would otherwise be shared between the two PropertiesI object. + // + //_properties = new java.util.HashMap<String, PropertyValue>(((PropertiesI)defaults)._properties); + for(java.util.Map.Entry<String, PropertyValue> p : (((PropertiesI)defaults)._properties).entrySet()) + { + _properties.put(p.getKey(), new PropertyValue(p.getValue())); + } } boolean loadConfigFiles = false; |