diff options
| -rw-r--r-- | cpp/src/Ice/RetryQueue.cpp | 2 | ||||
| -rw-r--r-- | cs/src/Ice/RetryQueue.cs | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/RetryQueue.java | 2 | ||||
| -rw-r--r-- | js/src/Ice/RetryQueue.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp index 785a650f7f0..19fa86c61d5 100644 --- a/cpp/src/Ice/RetryQueue.cpp +++ b/cpp/src/Ice/RetryQueue.cpp @@ -72,13 +72,13 @@ void IceInternal::RetryQueue::destroy() { Lock sync(*this); - _instance = 0; for(set<RetryTaskPtr>::const_iterator p = _requests.begin(); p != _requests.end(); ++p) { _instance->timer()->cancel(*p); (*p)->destroy(); } _requests.clear(); + _instance = 0; } bool diff --git a/cs/src/Ice/RetryQueue.cs b/cs/src/Ice/RetryQueue.cs index fe7006fe204..03ca716e542 100644 --- a/cs/src/Ice/RetryQueue.cs +++ b/cs/src/Ice/RetryQueue.cs @@ -62,13 +62,13 @@ namespace IceInternal { lock(this) { - _instance = null; foreach(RetryTask task in _requests.Keys) { _instance.timer().cancel(task); task.destroy(); } _requests.Clear(); + _instance = null; } } diff --git a/java/src/IceInternal/RetryQueue.java b/java/src/IceInternal/RetryQueue.java index 232ee1568cd..4d6f8144410 100644 --- a/java/src/IceInternal/RetryQueue.java +++ b/java/src/IceInternal/RetryQueue.java @@ -31,12 +31,12 @@ public class RetryQueue synchronized public void destroy() { - _instance = null; for(RetryTask task : _requests) { task.destroy(); } _requests.clear(); + _instance = null; } synchronized boolean diff --git a/js/src/Ice/RetryQueue.js b/js/src/Ice/RetryQueue.js index f0638519a06..c33a3d9146d 100644 --- a/js/src/Ice/RetryQueue.js +++ b/js/src/Ice/RetryQueue.js @@ -33,12 +33,12 @@ var RetryQueue = Class({ }, destroy: function() { - this._instance = null; for(var i = 0; i < this._requests.length; ++i) { this._requests[i].destroy(); } this._requests = []; + this._instance = null; }, remove: function(task) { |