From 39bf5d7e1971b80adb36f51292c815977354e0b1 Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Mon, 3 Apr 2006 15:47:22 +0000 Subject: Fix bug 874 --- cpp/src/Ice/RouterInfo.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'cpp/src/Ice/RouterInfo.cpp') 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 -- cgit v1.2.3