summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorParser.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-11-11 13:56:10 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-11-11 13:56:10 +0000
commit930e9797f420ed538bc4e55ffeb76b8596e12715 (patch)
tree2fdac6237a544c168430c6e94804551117e094e0 /cpp/src/IceGrid/DescriptorParser.cpp
parentfix a copy problem (diff)
downloadice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.bz2
ice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.xz
ice-930e9797f420ed538bc4e55ffeb76b8596e12715.zip
:activate() would contact the locator even if the OA id was empty.
Fixed a bug where ${node.os} for example couldn't be used in distribution directories. Unknown elements in XML file are now treated as errors.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 11711954bc9..f4bed9e2f6a 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -384,6 +384,16 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
}
_currentCommunicator->addDbEnvProperty(attributes);
}
+ else if(name == "description" || name == "option" || name == "env" || name == "directory")
+ {
+ //
+ // Nothing to do.
+ //
+ }
+ else
+ {
+ error("unknown element `" + name + "'");
+ }
attributes.checkUnknownAttributes();
}