Better collocation optimization, fix for ICE-5489, ICE-5484

1 files changed, 3 insertions, 17 deletions

diff --git a/java/src/IceInternal/ConnectionRequestHandler.java b/java/src/IceInternal/ConnectionRequestHandler.java
index 07a8d9c43e0..7820790e794 100644
--- a/java/src/IceInternal/ConnectionRequestHandler.java
+++ b/java/src/IceInternal/ConnectionRequestHandler.java
@@ -15,7 +15,7 @@ public class ConnectionRequestHandler implements RequestHandler
 {
     public void
     prepareBatchRequest(BasicStream out)
-        throws LocalExceptionWrapper
+        throws RetryException
     {
         _connection.prepareBatchRequest(out);
     }
@@ -34,14 +34,14 @@ public class ConnectionRequestHandler implements RequestHandler
 
     public boolean
     sendRequest(OutgoingMessageCallback out)
-        throws LocalExceptionWrapper
+        throws RetryException
     {
         return out.send(_connection, _compress, _response) && !_response; // Finished if sent and no response
     }
 
     public int
     sendAsyncRequest(OutgoingAsyncMessageCallback out)
-        throws LocalExceptionWrapper
+        throws RetryException
     {
         return out.__send(_connection, _compress, _response);
     }
@@ -58,20 +58,6 @@ public class ConnectionRequestHandler implements RequestHandler
         _connection.asyncRequestTimedOut(outAsync);
     }
 
-    public Outgoing
-    getOutgoing(String operation, Ice.OperationMode mode, java.util.Map<String, String> context, 
-                InvocationObserver observer)
-        throws LocalExceptionWrapper
-    {
-        return _connection.getOutgoing(this, operation, mode, context, observer);
-    }
-
-    public void
-    reclaimOutgoing(Outgoing out)
-    {
-        _connection.reclaimOutgoing(out);
-    }
-
     public Reference 
     getReference()
     {