summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorParser.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-10-14 12:09:55 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-10-14 12:09:55 +0000
commit0ad391c274b602b18856199bc50af5d724614735 (patch)
tree86911ea2362ac45bf7ab074bb71ddb9ef4e310dd /cpp/src/IceGrid/DescriptorParser.cpp
parentRemoved IceStorm.TopicManagerIdentity (diff)
downloadice-0ad391c274b602b18856199bc50af5d724614735.tar.bz2
ice-0ad391c274b602b18856199bc50af5d724614735.tar.xz
ice-0ad391c274b602b18856199bc50af5d724614735.zip
Fixed bugs
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 1cacdac14fe..31c9ccbc9d7 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -474,7 +474,7 @@ DescriptorHandler::endElement(const string& name, int line, int column)
assert(_currentCommunicator);
_currentCommunicator->setDbEnvDescription(elementValue());
}
- if(_currentCommunicator)
+ else if(_currentCommunicator)
{
_currentCommunicator->setDescription(elementValue());
}
@@ -488,7 +488,7 @@ DescriptorHandler::endElement(const string& name, int line, int column)
}
else
{
- error("element <comment> can only be the child of an <application>, <server> or <service> element");
+ error("element <description> is not allowed here");
}
}
else if(name == "option")