diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-12-07 18:36:13 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-12-07 18:36:13 +0000 |
| commit | 1ea1d98265ee07e24ab7c1db07f87fbde0df8deb (patch) | |
| tree | abf4502b817bb13fec76ab15ac160729e3ade20c /cpp/src | |
| parent | add AMD support to generated implementation examples (diff) | |
| download | ice-1ea1d98265ee07e24ab7c1db07f87fbde0df8deb.tar.bz2 ice-1ea1d98265ee07e24ab7c1db07f87fbde0df8deb.tar.xz ice-1ea1d98265ee07e24ab7c1db07f87fbde0df8deb.zip | |
collocation opt can now be switched off
Diffstat (limited to 'cpp/src')
| -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) { |