diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-19 08:07:06 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-19 08:07:06 +0000 |
| commit | 719863efae555485928de5e33c303bc753fdc7d6 (patch) | |
| tree | 34a2d8431f36d184d00b2b2cc3925cfd709b78f5 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Mono fixes. (diff) | |
| download | ice-719863efae555485928de5e33c303bc753fdc7d6.tar.bz2 ice-719863efae555485928de5e33c303bc753fdc7d6.tar.xz ice-719863efae555485928de5e33c303bc753fdc7d6.zip | |
Fixed IceGrid bugs 1381, 1382, 1369, 1342, 1341, 1334
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 6360c92dd07..acdc992d2ab 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -413,7 +413,9 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } else if(name == "distrib") { - if(!_currentApplication.get() && (!_currentServer.get() || _currentServer.get() != _currentCommunicator)) + if(!_currentApplication.get() || + (_currentNode.get() || _currentTemplate.get()) && !_currentServer.get() || + _currentServer.get() != _currentCommunicator) { error("the <distrib> element can only be a child of an <application>, <server> or <icebox> element"); } |