summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-04-03 15:47:22 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-04-03 15:47:22 +0000
commit39bf5d7e1971b80adb36f51292c815977354e0b1 (patch)
tree2a286a95b8ca8a681ce289d4bcd30689731c9464 /cpp
parentFixed warnings (diff)
downloadice-39bf5d7e1971b80adb36f51292c815977354e0b1.tar.bz2
ice-39bf5d7e1971b80adb36f51292c815977354e0b1.tar.xz
ice-39bf5d7e1971b80adb36f51292c815977354e0b1.zip
Fix bug 874
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/RouterInfo.cpp18
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