diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-03-14 18:47:45 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-03-14 18:47:45 +0100 |
| commit | 1ec8426013773ceb6b649137b7016793065d6c44 (patch) | |
| tree | bcdf2e9f0bd4eba61e08aebd61e5801e4fdf04dd /cpp/src/Ice/RouterInfo.cpp | |
| parent | Bug 2787 (diff) | |
| download | ice-1ec8426013773ceb6b649137b7016793065d6c44.tar.bz2 ice-1ec8426013773ceb6b649137b7016793065d6c44.tar.xz ice-1ec8426013773ceb6b649137b7016793065d6c44.zip | |
Fixed bug 2684 + collocation optimization bug
Diffstat (limited to 'cpp/src/Ice/RouterInfo.cpp')
| -rw-r--r-- | cpp/src/Ice/RouterInfo.cpp | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index cad1a60e862..5e62d7979f0 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -193,7 +193,21 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr& virtual void ice_exception(const Ice::Exception& ex) { - _callback->setException(dynamic_cast<const Ice::LocalException&>(ex)); + if(dynamic_cast<const Ice::CollocationOptimizationException*>(&ex)) + { + try + { + _callback->setEndpoints(_routerInfo->getClientEndpoints()); + } + catch(const Ice::LocalException& e) + { + _callback->setException(e); + } + } + else + { + _callback->setException(dynamic_cast<const Ice::LocalException&>(ex)); + } } Callback(const RouterInfoPtr& routerInfo, const GetClientEndpointsCallbackPtr& callback) : @@ -274,7 +288,22 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCal virtual void ice_exception(const Ice::Exception& ex) { - _callback->setException(dynamic_cast<const Ice::LocalException&>(ex)); + if(dynamic_cast<const Ice::CollocationOptimizationException*>(&ex)) + { + try + { + _routerInfo->addProxy(_proxy); + _callback->addedProxy(); + } + catch(const Ice::LocalException& e) + { + _callback->setException(e); + } + } + else + { + _callback->setException(dynamic_cast<const Ice::LocalException&>(ex)); + } } Callback(const RouterInfoPtr& routerInfo, const Ice::ObjectPrx& proxy, const AddProxyCallbackPtr& callback) : |