diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-10-11 07:50:31 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-10-11 07:50:31 +0000 |
| commit | 8e9b12de541e2a641c7e450df16e5a78bef20ec1 (patch) | |
| tree | 66236a42905eec0c913479ba406f6688fd879e05 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | file policy.3.1.iceboxcs was initially added on branch R3_1_branch. (diff) | |
| download | ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.tar.bz2 ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.tar.xz ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.zip | |
Bug fixes, replication test.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index acdc992d2ab..ea7d672fe32 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -206,7 +206,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { if(!_currentApplication.get()) { - error("the <server> element can only be a child of an <application> element"); + error("the <node> element can only be a child of an <application> element"); } _currentNode.reset(_currentApplication->createNode(attributes)); } @@ -252,7 +252,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "server-template") { - if(_currentTemplate.get() || _currentNode.get()) + if(!_currentApplication.get() || _currentTemplate.get() || _currentNode.get()) { error("the <server-template> element can only be a child of an <application> element"); } @@ -285,7 +285,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "service-template") { - if(_currentNode.get() || _currentTemplate.get()) + if(!_currentApplication.get() || _currentNode.get() || _currentTemplate.get()) { error("the <service-template> element can only be a child of an <application> element"); } |