1 files changed, 11 insertions, 18 deletions
diff --git a/java/src/IceInternal/ConnectionRequestHandler.java b/java/src/IceInternal/ConnectionRequestHandler.java
index 79f7ab45440..07a8d9c43e0 100644
--- a/java/src/IceInternal/ConnectionRequestHandler.java
+++ b/java/src/IceInternal/ConnectionRequestHandler.java
@@ -32,37 +32,30 @@ public class ConnectionRequestHandler implements RequestHandler
         _connection.abortBatchRequest();
     }
 
-    public Ice.ConnectionI
-    sendRequest(Outgoing out)
+    public boolean
+    sendRequest(OutgoingMessageCallback out)
         throws LocalExceptionWrapper
     {
-        if(!_connection.sendRequest(out, _compress, _response) || _response)
-        {
-            return _connection; // The request has been sent or we're expecting a response.
-        }
-        else
-        {
-            return null; // The request has been sent.
-        }
+        return out.send(_connection, _compress, _response) && !_response; // Finished if sent and no response
     }
 
     public int
-    sendAsyncRequest(OutgoingAsync out)
+    sendAsyncRequest(OutgoingAsyncMessageCallback out)
         throws LocalExceptionWrapper
     {
-        return _connection.sendAsyncRequest(out, _compress, _response);
+        return out.__send(_connection, _compress, _response);
     }
 
-    public boolean
-    flushBatchRequests(BatchOutgoing out)
+    public void 
+    requestTimedOut(OutgoingMessageCallback out)
     {
-        return _connection.flushBatchRequests(out);
+        _connection.requestTimedOut(out);
     }
 
-    public int
-    flushAsyncBatchRequests(BatchOutgoingAsync out)
+    public void 
+    asyncRequestTimedOut(OutgoingAsyncMessageCallback outAsync)
     {
-        return _connection.flushAsyncBatchRequests(out);
+        _connection.asyncRequestTimedOut(outAsync);
     }
 
     public Outgoing