summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectPrxHelperBase.java
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 /java/src/Ice/ObjectPrxHelperBase.java
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 'java/src/Ice/ObjectPrxHelperBase.java')
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 8e67edb4d88..302ec582abd 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -716,7 +716,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
// Don't wait for the connection to be established.
return __del.__getRequestHandler().getConnection(false);
}
- catch(CollocationOptimizationException ex)
+ catch(LocalException ex)
{
}
}