From c6ca68d97aa5bbc2a172e3e35171b5452657fa22 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 10 Mar 2015 12:12:10 +0100
Subject: ICE-6170 - fixed behavior of batch requests

---
 cpp/src/Ice/ConnectionRequestHandler.cpp | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

(limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp')

diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index f6d0adf7ae8..cab544915e6 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -27,12 +27,6 @@ ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference
 {
 }
 
-RequestHandlerPtr
-ConnectionRequestHandler::connect(const Ice::ObjectPrx&)
-{
-    return this;
-}
-
 RequestHandlerPtr
 ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
@@ -60,34 +54,16 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const
     return this;
 }
 
-void
-ConnectionRequestHandler::prepareBatchRequest(BasicStream* out)
-{
-    _connection->prepareBatchRequest(out);
-}
-
-void
-ConnectionRequestHandler::finishBatchRequest(BasicStream* out)
-{
-    _connection->finishBatchRequest(out, _compress);
-}
-
-void
-ConnectionRequestHandler::abortBatchRequest()
-{
-    _connection->abortBatchRequest();
-}
-
 bool
-ConnectionRequestHandler::sendRequest(OutgoingBase* out)
+ConnectionRequestHandler::sendRequest(ProxyOutgoingBase* out)
 {
-    return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response
+    return out->invokeRemote(_connection, _compress, _response) && !_response; // Finished if sent and no response
 }
 
 AsyncStatus
-ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
+ConnectionRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out)
 {
-    return out->send(_connection, _compress, _response);
+    return out->invokeRemote(_connection, _compress, _response);
 }
 
 void
-- 
cgit v1.2.3