summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index f59748d74c0..38d6cac7992 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -264,15 +264,7 @@ Ice::ConnectionI::close(bool force)
// requests to be retried, regardless of whether the server
// has processed them or not.
//
- // For consistency, we also wait until batch requests have
- // completed, and, if this is a server connection, all
- // requests have been dispatched. These are the same criteria
- // that we use to determine whether ACM may close this
- // connection.
- //
- while(!_requests.empty() || !_asyncRequests.empty() ||
- _batchStreamInUse || !_batchStream.b.empty() ||
- _dispatchCount != 0)
+ while(!_requests.empty() || !_asyncRequests.empty())
{
wait();
}