diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 09:51:28 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 09:51:28 +0000 |
| commit | a6cb3af17287c96cb1ed307b42fe9633d1905630 (patch) | |
| tree | 93dd4bfa368f581998fbcf20802e84fb3f22ef8e /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | More changes for inconsistent ice_* proxy methods (diff) | |
| download | ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.tar.bz2 ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.tar.xz ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.zip | |
Property set bug fixes, locator tracing.
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)); } |