summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectPrxHelperBase.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-03-31 15:33:52 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-03-31 15:33:52 +0000
commit838347d01ccf547ed7829c7bc9810e9ef47f4c2c (patch)
treee8ceac7a34a721a9f4179fd8ea3617e9ea4446e0 /java/src/Ice/ObjectPrxHelperBase.java
parentmerge from R2_1_branch to get windows installers automation changes (diff)
downloadice-838347d01ccf547ed7829c7bc9810e9ef47f4c2c.tar.bz2
ice-838347d01ccf547ed7829c7bc9810e9ef47f4c2c.tar.xz
ice-838347d01ccf547ed7829c7bc9810e9ef47f4c2c.zip
ObjectNotExistException are now always retried.
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java27
1 files changed, 1 insertions, 26 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index c7e831add11..2c30be1202b 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -588,18 +588,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
_delegate = null;
}
- try
- {
- IceInternal.IndirectReference ir = (IceInternal.IndirectReference)_reference;
- if(ir != null && ir.getLocatorInfo() != null)
- {
- ir.getLocatorInfo().clearObjectCache(ir);
- }
- }
- catch(ClassCastException e)
- {
- }
-
if(ice_isOneway() || ice_isBatchOneway())
{
//
@@ -618,7 +606,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
IceInternal.ProxyFactory proxyFactory = _reference.getInstance().proxyFactory();
if(proxyFactory != null)
{
- return proxyFactory.checkRetryAfterException(ex, cnt);
+ return proxyFactory.checkRetryAfterException(ex, _reference, cnt);
}
else
{
@@ -634,19 +622,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
__rethrowException(LocalException ex)
{
_delegate = null;
-
- try
- {
- IceInternal.IndirectReference ir = (IceInternal.IndirectReference)_reference;
- if(ir != null && ir.getLocatorInfo() != null)
- {
- ir.getLocatorInfo().clearObjectCache(ir);
- }
- }
- catch(ClassCastException e)
- {
- }
-
throw ex;
}