diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-20 14:54:00 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-20 14:54:00 +0000 |
| commit | afc0423beb339fa18dd22acf6e79f759dd1b5d61 (patch) | |
| tree | 6025df15dfbc92dbbad5a65ebb94f94c100e5db2 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Use local date format (diff) | |
| download | ice-afc0423beb339fa18dd22acf6e79f759dd1b5d61.tar.bz2 ice-afc0423beb339fa18dd22acf6e79f759dd1b5d61.tar.xz ice-afc0423beb339fa18dd22acf6e79f759dd1b5d61.zip | |
Don't add again IceBox adapter proeprties if they already exist.
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index af59791511e..adb0feb1236 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -55,12 +55,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt // // Add the adapters and their configuration. // - string oaPropertyPrefix = "Ice.OA."; - if(getMMVersion(_desc->iceVersion) < 30200) - { - oaPropertyPrefix = ""; - } - + string oaPropertyPrefix = getMMVersion(_desc->iceVersion) < 30200 ? "" : "Ice.OA."; for(AdapterDescriptorSeq::const_iterator q = desc->adapters.begin(); q != desc->adapters.end(); ++q) { _desc->adapters.push_back(new InternalAdapterDescriptor(q->id, q->serverLifetime)); @@ -873,6 +868,10 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const props.push_back(createProperty("# Server configuration")); props.push_back(createProperty("Ice.ServerId", info.descriptor->id)); props.push_back(createProperty("Ice.ProgramName", info.descriptor->id)); + + // + // Add IceBox properties. + // string servicesStr; IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(info.descriptor); if(iceBox) |