diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-04-03 19:08:26 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-04-03 19:08:26 +0000 |
| commit | ee2819fcb3122150657b789edeaada9bccf365d9 (patch) | |
| tree | 1b47e8f558264101975cb0bcfa5a4c9a4cf20902 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Added support for import-default-templates in parsed files (diff) | |
| download | ice-ee2819fcb3122150657b789edeaada9bccf365d9.tar.bz2 ice-ee2819fcb3122150657b789edeaada9bccf365d9.tar.xz ice-ee2819fcb3122150657b789edeaada9bccf365d9.zip | |
import-default-templates is now always parsed
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 3cb4ab07ae3..7bd40412975 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -171,8 +171,13 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { error("only one <application> element is allowed"); } + + bool importTemplates = attributes.asBool("import-default-templates", false); - if(_admin && attributes.asBool("import-default-templates", false)) + // + // TODO: is ignoring importTemplates the desired behavior when _admin == 0? + // + if(importTemplates && _admin != 0) { try { |