diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
| commit | 7a7876a5fb8fac3f771431ce54cc806e41d1b7cf (patch) | |
| tree | 65a2d56f7e3eb942bbb8c3fd2a7ca6ff069c909f /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Added editor for replica groups (diff) | |
| download | ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.bz2 ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.xz ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.zip | |
Removed identity properties
Added description attribute to replica group and node descriptors.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 2183ed3ee2f..1cacdac14fe 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -460,8 +460,14 @@ DescriptorHandler::endElement(const string& name, int line, int column) { if(_inAdapter) { - assert(_currentCommunicator); - _currentCommunicator->setAdapterDescription(elementValue()); + if(_currentCommunicator) + { + _currentCommunicator->setAdapterDescription(elementValue()); + } + else + { + _currentApplication->setReplicaGroupDescription(elementValue()); + } } else if(_inDbEnv) { @@ -472,6 +478,10 @@ DescriptorHandler::endElement(const string& name, int line, int column) { _currentCommunicator->setDescription(elementValue()); } + else if(_currentNode.get()) + { + _currentNode->setDescription(elementValue()); + } else if(_currentApplication.get()) { _currentApplication->setDescription(elementValue()); |