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/DescriptorBuilder.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/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 5d4aed4c74d..44be7f678ef 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -340,6 +340,10 @@ ApplicationDescriptorBuilder::addNode(const string& name, const NodeDescriptor& void ApplicationDescriptorBuilder::addServerTemplate(const string& id, const TemplateDescriptor& templ) { + if(!templ.descriptor) + { + throw "invalid server template `" + id + "': server definition is missing"; + } if(!_descriptor.serverTemplates.insert(make_pair(id, templ)).second) { throw "duplicate server template `" + id + "'"; @@ -349,6 +353,10 @@ ApplicationDescriptorBuilder::addServerTemplate(const string& id, const Template void ApplicationDescriptorBuilder::addServiceTemplate(const string& id, const TemplateDescriptor& templ) { + if(!templ.descriptor) + { + throw "invalid service template `" + id + "': service definition is missing"; + } if(!_descriptor.serviceTemplates.insert(make_pair(id, templ)).second) { throw "duplicate service template `" + id + "'"; |