summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterFactory.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2003-01-15 23:11:48 +0000
committerMarc Laukien <marc@zeroc.com>2003-01-15 23:11:48 +0000
commit34bc50c451983a87de09beec5bebbae37f1847eb (patch)
treee5cc1a2a0a805e19d1f5155ff129d80bc1b9439a /cpp/src/Ice/ObjectAdapterFactory.cpp
parentfixed accept() problem; fixed "address already in use bug" (diff)
downloadice-34bc50c451983a87de09beec5bebbae37f1847eb.tar.bz2
ice-34bc50c451983a87de09beec5bebbae37f1847eb.tar.xz
ice-34bc50c451983a87de09beec5bebbae37f1847eb.zip
fixed a bug with findObjectAdapter
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index eb3715dc38a..6ef90d07158 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -101,7 +101,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
if(!_instance)
{
- throw CommunicatorDestroyedException(__FILE__, __LINE__);
+ throw ObjectAdapterDeactivatedException(__FILE__, __LINE__);
}
map<string, ObjectAdapterIPtr>::iterator p = _adapters.find(name);
@@ -122,7 +122,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
if(!_instance)
{
- throw CommunicatorDestroyedException(__FILE__, __LINE__);
+ return 0;
}
for(map<string, ObjectAdapterIPtr>::iterator p = _adapters.begin(); p != _adapters.end(); ++p)