From 930e9797f420ed538bc4e55ffeb76b8596e12715 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Fri, 11 Nov 2005 13:56:10 +0000
Subject: :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.

---
 cpp/src/IceGrid/DescriptorParser.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'cpp/src/IceGrid/DescriptorParser.cpp')

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();
     }
-- 
cgit v1.2.3