diff options
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.cpp | 4 | ||||
| -rw-r--r-- | java/src/IceInternal/ObjectAdapterFactory.java | 4 |
2 files changed, 4 insertions, 4 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) diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index a5bc4dab828..4b9d03074b0 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -107,7 +107,7 @@ public final class ObjectAdapterFactory { if(_instance == null) { - throw new Ice.CommunicatorDestroyedException(); + throw new Ice.ObjectAdapterDeactivatedException(); } Ice.ObjectAdapter adapter = (Ice.ObjectAdapter)_adapters.get(name); @@ -126,7 +126,7 @@ public final class ObjectAdapterFactory { if(_instance == null) { - throw new Ice.CommunicatorDestroyedException(); + return null; } java.util.Iterator i = _adapters.values().iterator(); |