diff options
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 10 | ||||
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 10 | ||||
| -rwxr-xr-x | cs/src/Ice/ConnectionI.cs | 10 | ||||
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 10 | ||||
| -rw-r--r-- | javae/src/Ice/Connection.java | 10 |
5 files changed, 5 insertions, 45 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(); } diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index afe4a5210dd..4fe759eafdd 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -126,15 +126,7 @@ Ice::Connection::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() || - _batchStreamInUse || !_batchStream.b.empty() || - _dispatchCount != 0) + while(!_requests.empty()) { wait(); } diff --git a/cs/src/Ice/ConnectionI.cs b/cs/src/Ice/ConnectionI.cs index 701d5f9ef59..d03a46c157f 100755 --- a/cs/src/Ice/ConnectionI.cs +++ b/cs/src/Ice/ConnectionI.cs @@ -253,15 +253,7 @@ namespace Ice // 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.Count != 0 || _asyncRequests.Count != 0 || - _batchStreamInUse || !_batchStream.isEmpty() || - _dispatchCount != 0) + while(_requests.Count != 0 || _asyncRequests.Count != 0) { Monitor.Wait(this); } diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 18fc01d28eb..7d4b6592861 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -251,15 +251,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne // 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.isEmpty() || !_asyncRequests.isEmpty() || - _batchStreamInUse || !_batchStream.isEmpty() || - _dispatchCount != 0) + while(!_requests.isEmpty() || !_asyncRequests.isEmpty()) { try { diff --git a/javae/src/Ice/Connection.java b/javae/src/Ice/Connection.java index 13228b1f8f5..869a9552c9f 100644 --- a/javae/src/Ice/Connection.java +++ b/javae/src/Ice/Connection.java @@ -88,15 +88,7 @@ public final class Connection // 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.isEmpty() || - _batchStreamInUse || !_batchStream.isEmpty() || - _dispatchCount != 0) + while(!_requests.isEmpty()) { try { |