summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterFactory.cpp
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-09-03 01:01:32 +0000
committerBrent Eagles <brent@zeroc.com>2005-09-03 01:01:32 +0000
commitcb0bb497fe7520301be12cc18a00132e767b3ac9 (patch)
tree8781100fbe7020b1621b3f5c781f35f44b87e17f /cpp/src/Ice/ObjectAdapterFactory.cpp
parentFix some compiler warnings (diff)
downloadice-cb0bb497fe7520301be12cc18a00132e767b3ac9.tar.bz2
ice-cb0bb497fe7520301be12cc18a00132e767b3ac9.tar.xz
ice-cb0bb497fe7520301be12cc18a00132e767b3ac9.zip
fix for bug 431, attempt to create object adapters with the same id now
throws and AlreadyRegisteredException
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index e041e5e2107..9bcd0e6580b 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -112,7 +112,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name)
map<string, ObjectAdapterIPtr>::iterator p = _adapters.find(name);
if(p != _adapters.end())
{
- return p->second;
+ throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
}
ObjectAdapterIPtr adapter = new ObjectAdapterI(_instance, _communicator, name);