diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-11-03 13:08:43 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-11-03 13:08:43 -0330 |
| commit | 353a27bc9dd5fcc19561f0b6b35a44d4728230fd (patch) | |
| tree | f02c18314b5ee08b6fcc62c85df6deab09118e38 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Bug 3385 - java class must match file name (diff) | |
| download | ice-353a27bc9dd5fcc19561f0b6b35a44d4728230fd.tar.bz2 ice-353a27bc9dd5fcc19561f0b6b35a44d4728230fd.tar.xz ice-353a27bc9dd5fcc19561f0b6b35a44d4728230fd.zip | |
Bug 3529 - check ice version before esacping properties
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 3e2b67a2025..01e308fed58 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -898,14 +898,14 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const // // For newer versions of Ice, we generate Ice.Admin properties: // - int iceVersion = 0; + server->iceVersion = 0; if(info.descriptor->iceVersion != "") { - iceVersion = getMMVersion(info.descriptor->iceVersion); + server->iceVersion = getMMVersion(info.descriptor->iceVersion); } server->processRegistered = false; - if(iceVersion == 0 || iceVersion >= 30300) + if(server->iceVersion == 0 || server->iceVersion >= 30300) { props.push_back(createProperty("Ice.Admin.ServerId", info.descriptor->id)); if(hasProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints")) @@ -949,7 +949,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const } props.push_back(createProperty("IceBox.LoadOrder", servicesStr)); - if(iceVersion != 0 && iceVersion < 30300) + if(server->iceVersion != 0 && server->iceVersion < 30300) { if(hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess")) { @@ -975,7 +975,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const // logs, adapters, db envs and properties to the internal server // descriptor. // - forEachCommunicator(ToInternalServerDescriptor(server, _session->getInfo(), iceVersion))(info.descriptor); + forEachCommunicator(ToInternalServerDescriptor(server, _session->getInfo(), server->iceVersion))(info.descriptor); return server; } |