diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-12-05 17:50:31 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-12-05 17:50:31 +0100 |
| commit | 0b217a4d45fc7352bbccb876410c12120f9bd017 (patch) | |
| tree | e6ff7789df1ee83a692cbee5f732c61acd02d114 /cpp/src | |
| parent | Fixed NPE in the outgoing connection factory (diff) | |
| download | ice-0b217a4d45fc7352bbccb876410c12120f9bd017.tar.bz2 ice-0b217a4d45fc7352bbccb876410c12120f9bd017.tar.xz ice-0b217a4d45fc7352bbccb876410c12120f9bd017.zip | |
Fixed bug where Ice.Admin.Endpoints would get duplicated
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 365ef7bb65c..01e15cb92fb 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -844,7 +844,7 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut void ServerDescriptorBuilder::finish() { - if(!isSet(_descriptor->propertySet.properties, "Ice.Admin.Enpoints")) + if(!isSet(_descriptor->propertySet.properties, "Ice.Admin.Endpoints")) { _hiddenProperties.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); } diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 7db02fdfa51..2f5762dccfc 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -873,9 +873,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const if(iceVersion == 0 || iceVersion >= 30300) { props.push_back(createProperty("Ice.Admin.ServerId", info.descriptor->id)); - - server->processRegistered = - getProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints") != ""; + server->processRegistered = getProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints") != ""; } else { @@ -896,8 +894,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const { ServiceDescriptorPtr s = p->descriptor; const string path = _session->getInfo()->dataDir + "/servers/" + server->id + "/config/config_" + s->name; - props.push_back( - createProperty("IceBox.Service." + s->name, s->entry + " --Ice.Config=\"" + path + "\"")); + props.push_back(createProperty("IceBox.Service." + s->name, s->entry + " --Ice.Config=\"" + path + "\"")); servicesStr += s->name + " "; } props.push_back(createProperty("IceBox.LoadOrder", servicesStr)); |