summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Connection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Connection.cpp')
-rw-r--r--cpp/src/Ice/Connection.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 39e4f3772c3..233b836b897 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -341,13 +341,10 @@ IceInternal::Connection::monitor()
// Active connection management for idle connections.
//
if(_acmTimeout > 0 &&
- _requests.empty() &&
- _asyncRequests.empty() &&
- !_batchStreamInUse &&
+ _requests.empty() && _asyncRequests.empty() &&
+ !_batchStreamInUse && _batchStream.b.empty() &&
_dispatchCount == 0)
{
- assert(_batchStream.b.empty());
-
if(IceUtil::Time::now() >= _acmAbsoluteTimeout)
{
setState(StateClosing, ConnectionTimeoutException(__FILE__, __LINE__));