diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
| commit | 96e45b30cd3dda2a13a029ef564a786a3546f316 (patch) | |
| tree | 97f4d030a2d8f8555cb4ed3b6d80802d80cda283 /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | Fixed missing assignment (diff) | |
| parent | Fixed bug 2480 & 2481 (diff) | |
| download | ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.bz2 ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.xz ice-96e45b30cd3dda2a13a029ef564a786a3546f316.zip | |
Merge branch 'timer-fixes'
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index d105b3c3090..e030ada78f1 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -956,12 +956,7 @@ IceBoxDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& attrs) void IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) { - if(attrs("name") != "IceBox.ServiceManager") - { - throw "<adapter> element can't be a child of an <icebox> element"; - } - - ServerDescriptorBuilder::addAdapter(attrs); + throw "<adapter> element can't be a child of an <icebox> element"; } void |