From 570455a381e6620f8ddfcca448559d3fa545ba38 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 10 Oct 2014 12:03:07 +0200 Subject: Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel() --- cpp/src/Ice/ConnectionRequestHandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp') diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index 43dda1b88ed..a94d3e7180a 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -91,27 +91,27 @@ ConnectionRequestHandler::abortBatchRequest() } bool -ConnectionRequestHandler::sendRequest(OutgoingMessageCallback* out) +ConnectionRequestHandler::sendRequest(OutgoingBase* out) { return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response } AsyncStatus -ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncMessageCallbackPtr& out) +ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out) { - return out->__send(_connection, _compress, _response); + return out->send(_connection, _compress, _response); } void -ConnectionRequestHandler::requestTimedOut(OutgoingMessageCallback* out) +ConnectionRequestHandler::requestCanceled(OutgoingBase* out, const Ice::LocalException& ex) { - _connection->requestTimedOut(out); + _connection->requestCanceled(out, ex); } void -ConnectionRequestHandler::asyncRequestTimedOut(const OutgoingAsyncMessageCallbackPtr& outAsync) +ConnectionRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex) { - _connection->asyncRequestTimedOut(outAsync); + _connection->asyncRequestCanceled(outAsync, ex); } Ice::ConnectionIPtr -- cgit v1.2.3