diff options
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"); } |