diff options
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 96b6f923ffd..e13e145d801 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -220,7 +220,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "server") { - if(!_currentNode.get() && !_currentTemplate.get() || _currentServer.get()) + if((!_currentNode.get() && !_currentTemplate.get()) || _currentServer.get()) { error("the <server> element can only be a child of a <node> or <server-template> element"); } @@ -236,7 +236,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "icebox") { - if(!_currentNode.get() && !_currentTemplate.get() || _currentServer.get()) + if((!_currentNode.get() && !_currentTemplate.get()) || _currentServer.get()) { error("the <icebox> element can only be a child of a <node> or <server-template> element"); } @@ -268,7 +268,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "service") { - if(!_currentServer.get() && !_currentTemplate.get() || _currentService.get()) + if((!_currentServer.get() && !_currentTemplate.get()) || _currentService.get()) { error("the <service> element can only be a child of an <icebox> or <service-template> element"); } @@ -414,7 +414,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at else if(name == "distrib") { if(!_currentApplication.get() || - (_currentNode.get() || _currentTemplate.get()) && !_currentServer.get() || + ((_currentNode.get() || _currentTemplate.get()) && !_currentServer.get()) || _currentServer.get() != _currentCommunicator) { error("the <distrib> element can only be a child of an <application>, <server> or <icebox> element"); |