diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 598dd2110a5..9b72c78c51d 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -244,24 +244,11 @@ Ice::PropertiesI::PropertiesI() Ice::PropertiesI::PropertiesI(StringSeq& args, const PropertiesPtr& defaults) { - // - // Since there is no way to iterate over all Properties, we - // assume that defaults (when not null) points to a PropertiesI - // if(defaults != 0) { - PropertiesI* defaultsI = dynamic_cast<PropertiesI*>(defaults.get()); - if(defaultsI == 0) - { - throw InitializationException(__FILE__, __LINE__, - "Invalid Properties implementation"); - } - - IceUtil::Mutex::Lock sync(*defaultsI); - _properties = defaultsI->_properties; + _properties = defaults->getPropertiesForPrefix(""); } - StringSeq::iterator q = args.begin(); if(q != args.end()) { |