summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Proxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 9e9019ecc99..69adce28413 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -705,17 +705,7 @@ IceProxy::Ice::Object::__getDelegate()
{
if(_reference->collocationOptimization)
{
- ObjectAdapterFactoryPtr objectAdapterFactory = _reference->instance->objectAdapterFactory();
-
- //
- // Instance components may be null if communicator has been destroyed.
- //
- if(!objectAdapterFactory)
- {
- throw CommunicatorDestroyedException(__FILE__, __LINE__);
- }
-
- ObjectAdapterPtr adapter = objectAdapterFactory->findObjectAdapter(this);
+ ObjectAdapterPtr adapter = _reference->instance->objectAdapterFactory()->findObjectAdapter(this);
if(adapter)
{
Handle< ::IceDelegateD::Ice::Object> delegate = __createDelegateD();