diff options
Diffstat (limited to 'cpp/src/IceGrid/LocatorI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index d038ccae641..1f2291fe0e9 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -653,6 +653,9 @@ LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb, Ice::ObjectPrx proxy; try { +#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) + IceUtil::DummyBCC dummy; +#endif proxy = _database->getObjectProxy(id); } catch(const ObjectNotRegisteredException&) @@ -717,18 +720,10 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb, request = new AdapterRequest(cb, self, adapters[0]); } request->execute(); + return; } catch(const AdapterNotExistException&) { - try - { - cb->ice_response(_database->getAdapterDirectProxy(id)); - } - catch(const AdapterNotExistException&) - { - cb->ice_exception(Ice::AdapterNotFoundException()); - } - return; } catch(const Ice::Exception& ex) { @@ -748,6 +743,18 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb, cb->ice_response(0); return; } + + try + { +#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) + IceUtil::DummyBCC dummy; +#endif + cb->ice_response(_database->getAdapterDirectProxy(id)); + } + catch(const AdapterNotExistException&) + { + cb->ice_exception(Ice::AdapterNotFoundException()); + } } Ice::LocatorRegistryPrx |