summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2007-02-14 14:14:32 +0000
committerDwayne Boone <dwayne@zeroc.com>2007-02-14 14:14:32 +0000
commit4cbf45c5978301cf55a8bcc3ba6c7e7a3d12d421 (patch)
tree1dbde78df392b3ab8165af40bd9108bf4db12c8d /cpp/src
parentRemoved use of Ice.OA. (diff)
downloadice-4cbf45c5978301cf55a8bcc3ba6c7e7a3d12d421.tar.bz2
ice-4cbf45c5978301cf55a8bcc3ba6c7e7a3d12d421.tar.xz
ice-4cbf45c5978301cf55a8bcc3ba6c7e7a3d12d421.zip
Bug in last commit
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 3f69ac6c40f..68f33a7e1a9 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -754,8 +754,8 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
// Make sure named adapter has some configuration
//
PropertiesPtr properties = instance->initializationData().properties;
- StringSeq oldProps = filterProperties(_name + ".");
- if(endpointInfo.empty() && router == 0)
+ StringSeq props = filterProperties(_name + ".");
+ if(endpointInfo.empty() && router == 0 && props.size() == 0)
{
InitializationException ex(__FILE__, __LINE__);
ex.reason = "object adapter \"" + _name + "\" requires configuration.";