Ported fix for bug 574.

1 files changed, 8 insertions, 8 deletions

diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 6640129de61..c32f6055829 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -14,7 +14,7 @@ public final class Outgoing
     public
     Outgoing(Ice.ConnectionI connection, Reference ref, String operation, Ice.OperationMode mode,
 	     java.util.Map context, boolean compress)
-	throws NonRepeatable
+	throws LocalExceptionWrapper
     {
         _connection = connection;
         _reference = ref;
@@ -31,7 +31,7 @@ public final class Outgoing
     //
     public void
     reset(Reference ref, String operation, Ice.OperationMode mode, java.util.Map context, boolean compress)
-	throws NonRepeatable
+	throws LocalExceptionWrapper
     {
 	_reference = ref;
         _state = StateUnsent;
@@ -51,7 +51,7 @@ public final class Outgoing
     // Returns true if ok, false if user exception.
     public boolean
     invoke()
-        throws NonRepeatable
+        throws LocalExceptionWrapper
     {
 	assert(_state == StateUnsent);
 
@@ -165,11 +165,11 @@ public final class Outgoing
                     }
 
                     //
-                    // Throw the exception wrapped in a NonRepeatable, to
+                    // Throw the exception wrapped in a LocalExceptionWrapper, to
                     // indicate that the request cannot be resent without
                     // potentially violating the "at-most-once" principle.
                     //
-                    throw new NonRepeatable(_exception);
+                    throw new LocalExceptionWrapper(_exception, false);
                 }
 
                 if(_state == StateUserException)
@@ -216,7 +216,7 @@ public final class Outgoing
 
     public void
     abort(Ice.LocalException ex)
-        throws NonRepeatable
+        throws LocalExceptionWrapper
     {
 	assert(_state == StateUnsent);
 
@@ -236,7 +236,7 @@ public final class Outgoing
 	    // be aborted, but all other requests in the batch as
 	    // well.
 	    //
-	    throw new NonRepeatable(ex);
+	    throw new LocalExceptionWrapper(ex, false);
 	}
 
 	throw ex;
@@ -413,7 +413,7 @@ public final class Outgoing
 
     private void
     writeHeader(String operation, Ice.OperationMode mode, java.util.Map context)
-	throws NonRepeatable
+	throws LocalExceptionWrapper
     {
         switch(_reference.getMode())
         {