diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-08 19:58:08 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-08 19:58:08 +0000 |
| commit | c622d9360aa9c68bbd9801a15565fb817301abed (patch) | |
| tree | ede56a1e419d116fc613ceb256761ebbe18fa722 /cpp/src/Ice/PropertiesI.cpp | |
| parent | updates to the python test harness. (diff) | |
| download | ice-c622d9360aa9c68bbd9801a15565fb817301abed.tar.bz2 ice-c622d9360aa9c68bbd9801a15565fb817301abed.tar.xz ice-c622d9360aa9c68bbd9801a15565fb817301abed.zip | |
Better implementation
Diffstat (limited to 'cpp/src/Ice/PropertiesI.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()) { |