no retry for batch requests

1 files changed, 16 insertions, 1 deletions

diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index c334bded12c..d5b62a80522 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -600,6 +600,17 @@ public class ObjectPrxHelperBase implements ObjectPrx
 	{
 	}
 
+	if(ice_isBatchOneway() || ice_isBatchDatagram())
+	{
+	    //
+	    // We do not retry batch requests (except for problems
+	    // during connection establishment, which are not handled
+	    // here anyway). If we retry a batch request, previous
+	    // requests from the same batch are silently thrown away.
+	    //
+	    throw ex;
+	}
+
 	IceInternal.ProxyFactory proxyFactory = _reference.getInstance().proxyFactory();
 	if(proxyFactory != null)
 	{
@@ -607,7 +618,11 @@ public class ObjectPrxHelperBase implements ObjectPrx
 	}
 	else
 	{
-	    throw ex; // The communicator is already destroyed, so we cannot retry.
+	    //
+            // The communicator is already destroyed, so we cannot
+            // retry.
+	    //
+	    throw ex;
 	}
     }