diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.h | 1 |
2 files changed, 11 insertions, 5 deletions
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; } } diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 0115fb71fbb..4eec180dfa8 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -65,7 +65,6 @@ private: const std::string _host; const Ice::Int _port; const Ice::Int _timeout; - const std::string _connectionId; const bool _compress; }; |