diff options
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 3ac812434e4..91aa03f4fe3 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -350,7 +350,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { _currentPropertySet.reset(_currentNode->createPropertySet(attributes)); } - else if(_currentApplication.get()) + else if(_currentApplication.get() && !_currentTemplate.get()) { _currentPropertySet.reset(_currentApplication->createPropertySet(attributes)); } |