From 16c6179e7ca9a0fcfbe0ccd2320c2f3af1ab68fa Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 26 Oct 2012 11:04:37 +0200 Subject: Fixed bug in communicator flush batch requests, also fixed C++ SSL issue where ice_connectionId wouldn't work --- cpp/src/Ice/OutgoingAsync.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'cpp/src/Ice/OutgoingAsync.cpp') diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 126fa243ddc..5dd2238944f 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1043,7 +1043,6 @@ IceInternal::CommunicatorBatchOutgoingAsync::flushConnection(const ConnectionIPt using BatchOutgoingAsync::__sent; #endif - virtual void __finished(const Ice::LocalException& ex, bool) { _remoteObserver.failed(ex.ice_name()); @@ -1067,10 +1066,18 @@ IceInternal::CommunicatorBatchOutgoingAsync::flushConnection(const ConnectionIPt ++_useCount; } - AsyncStatus status = con->flushAsyncBatchRequests(new BatchOutgoingAsyncI(this, _instance, _observer)); - if(!(status & AsyncStatusSent)) + try { - _sentSynchronously = false; + AsyncStatus status = con->flushAsyncBatchRequests(new BatchOutgoingAsyncI(this, _instance, _observer)); + if(!(status & AsyncStatusSent)) + { + _sentSynchronously = false; + } + } + catch(const Ice::LocalException&) + { + check(false); + throw; } } -- cgit v1.2.3