diff options
| -rw-r--r-- | cpp/src/Ice/RouterInfo.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 721ec912fe7..c842636a18d 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -173,7 +173,14 @@ IceInternal::RouterInfo::getClientProxy() // we must use the same timeout as the already existing // connection. // - _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + try + { + _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + } + catch(const Ice::CollocationOptimizationException&) + { + // Ignore - collocated router + } } return _clientProxy; @@ -190,7 +197,14 @@ IceInternal::RouterInfo::setClientProxy(const ObjectPrx& clientProxy) // In order to avoid creating a new connection to the router, we // must use the same timeout as the already existing connection. // - _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + try + { + _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout()); + } + catch(const Ice::CollocationOptimizationException&) + { + // Ignore - collocated router + } } ObjectPrx |