diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 2176d2874a0..5cb2a7e7036 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -670,18 +670,18 @@ IceProxy::Ice::Object::__getDelegate() if(!_delegate) { - ObjectAdapterFactoryPtr objectAdapterFactory = _reference->instance->objectAdapterFactory(); - - // - // Instance components may be null if Communicator has been destroyed. - // - if(!objectAdapterFactory) - { - throw CommunicatorDestroyedException(__FILE__, __LINE__); - } - 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); if(adapter) { |