fix for bug 218: Hang if oneways are not flushed

1 files changed, 26 insertions, 0 deletions

diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java
index 158a12d1247..c3a8132395a 100644
--- a/java/src/IceInternal/ProxyFactory.java
+++ b/java/src/IceInternal/ProxyFactory.java
@@ -105,6 +105,32 @@ public final class ProxyFactory
 	    throw ex;
 	}
 
+	//
+	// There is no point in retrying an operation that resulted in a
+	// MarshalException. This must have been raised locally (because if
+	// it happened in a server it would result in an UnknownLocalException
+	// instead), which means there was a problem in this process that will
+	// not change if we try again.
+	//
+	// The most likely cause for a MarshalException is exceeding the
+	// maximum message size, which is represented by the the subclass
+	// MemoryLimitException. For example, a client can attempt to send a
+	// message that exceeds the maximum memory size, or accumulate enough
+	// batch requests without flushing that the maximum size is reached.
+	//
+	// This latter case is especially problematic, because if we were to
+	// retry a batch request after a MarshalException, we would in fact
+	// silently discard the accumulated requests and allow new batch
+	// requests to accumulate. If the subsequent batched requests do not
+	// exceed the maximum message size, it appears to the client that all
+	// of the batched requests were accepted, when in reality only the
+	// last few are actually sent.
+	//
+	if(ex instanceof Ice.MarshalException)
+	{
+	    throw ex;
+	}
+
 	++cnt;
 
         TraceLevels traceLevels = _instance.traceLevels();