diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-06-16 12:29:42 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-06-16 12:29:42 +0000 |
| commit | 2cc2e228f93e4b75c0ae427ca3f7165653b18efc (patch) | |
| tree | c575919a98e00526f024c32ce369e67e64586b59 /cpp/src/IceGrid/Parser.cpp | |
| parent | Removed application attribute in ServerDescriptor, moved "node" attribute (diff) | |
| download | ice-2cc2e228f93e4b75c0ae427ca3f7165653b18efc.tar.bz2 ice-2cc2e228f93e4b75c0ae427ca3f7165653b18efc.tar.xz ice-2cc2e228f93e4b75c0ae427ca3f7165653b18efc.zip | |
Fixes
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 9ca2ddbdaa4..d0f23c31f9f 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -579,13 +579,12 @@ Parser::describeApplication(const list<string>& args) for(ServerInstanceDescriptorSeq::const_iterator p = application->servers.begin(); p != application->servers.end(); ++p) { - const ServerDescriptorPtr descriptor = ServerDescriptorPtr::dynamicCast(p->descriptor); - map<string, set<string> >::iterator q = servers.find(descriptor->node); + map<string, set<string> >::iterator q = servers.find(p->node); if(q == servers.end()) { - q = servers.insert(make_pair(descriptor->node, set<string>())).first; + q = servers.insert(make_pair(p->node, set<string>())).first; } - q->second.insert(descriptor->name); + q->second.insert(p->descriptor->name); } } { @@ -823,8 +822,9 @@ Parser::diffApplication(const list<string>& args) { if(desc->name == q->descriptor->name) { - ServerDescriptorPtr orig = ServerDescriptorPtr::dynamicCast(q->descriptor); - if(ServerDescriptorHelper(newAppHelper, desc) != ServerDescriptorHelper(origAppHelper, orig)) + ServerDescriptorPtr orig = q->descriptor; + if(q->node != p->node || + ServerDescriptorHelper(newAppHelper, desc) != ServerDescriptorHelper(origAppHelper, orig)) { updated.insert(orig->name); } |