summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Proxy.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2009-03-12 11:41:53 +0100
committerBenoit Foucher <benoit@zeroc.com>2009-03-12 11:41:53 +0100
commit3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1 (patch)
tree926f00845be18841a7e8f550292d4622f8bd875b /cpp/src/Ice/Proxy.cpp
parent- Fixed potential assert when establishing connection for proxies with (diff)
downloadice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.tar.bz2
ice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.tar.xz
ice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.zip
- Fixed bug 3853 - ice_getCachedConnection could throw
- Fixed bug 3808 - odd output from IceGrid/activation test
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index bc8578a3420..8113517ca4f 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -799,7 +799,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const
{
return __del->__getRequestHandler()->getConnection(false);
}
- catch(const CollocationOptimizationException&)
+ catch(const LocalException&)
{
}
}