1 files changed, 11 insertions, 18 deletions
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index 9ecbef4eca4..0d503201310 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -56,35 +56,28 @@ ConnectionRequestHandler::abortBatchRequest()
     _connection->abortBatchRequest();
 }
 
-Ice::ConnectionI*
-ConnectionRequestHandler::sendRequest(Outgoing* out)
+bool
+ConnectionRequestHandler::sendRequest(OutgoingMessageCallback* out)
 {
-    if(!_connection->sendRequest(out, _compress, _response) || _response)
-    {
-        return _connection.get(); // The request hasn't been sent or we're expecting a response.
-    }
-    else
-    {
-        return 0; // The request has been sent.
-    }
+    return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response
 }
 
 AsyncStatus
-ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncPtr& out)
+ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncMessageCallbackPtr& out)
 {
-    return _connection->sendAsyncRequest(out, _compress, _response);
+    return out->__send(_connection, _compress, _response);
 }
 
-bool
-ConnectionRequestHandler::flushBatchRequests(BatchOutgoing* out)
+void 
+ConnectionRequestHandler::requestTimedOut(OutgoingMessageCallback* out)
 {
-    return _connection->flushBatchRequests(out);
+    _connection->requestTimedOut(out);
 }
 
-AsyncStatus
-ConnectionRequestHandler::flushAsyncBatchRequests(const BatchOutgoingAsyncPtr& out)
+void 
+ConnectionRequestHandler::asyncRequestTimedOut(const OutgoingAsyncMessageCallbackPtr& outAsync)
 {
-    return _connection->flushAsyncBatchRequests(out);
+    _connection->asyncRequestTimedOut(outAsync);
 }
 
 Ice::ConnectionIPtr