diff options
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index ae06066629a..22e6cdf1c95 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -3185,8 +3185,8 @@ ServerI::getProperties(const InternalServerDescriptorPtr& desc) // // Copy the descriptor properties. // - PropertyDescriptorSeqDict properties = desc->properties; - PropertyDescriptorSeq& props = properties["config"]; + PropertyDescriptorSeqDict propDict = desc->properties; + PropertyDescriptorSeq& props = propDict["config"]; // // Cache the path of the stderr/stdout file, first check if the @@ -3216,7 +3216,7 @@ ServerI::getProperties(const InternalServerDescriptorPtr& desc) // { const PropertyDescriptorSeq& overrides = _node->getPropertiesOverride(); - for(PropertyDescriptorSeqDict::iterator p = properties.begin(); p != properties.end(); ++p) + for(PropertyDescriptorSeqDict::iterator p = propDict.begin(); p != propDict.end(); ++p) { if(getProperty(p->second, "Ice.Default.Locator").empty()) { @@ -3244,5 +3244,5 @@ ServerI::getProperties(const InternalServerDescriptorPtr& desc) } } - return properties; + return propDict; } |