diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-25 14:41:29 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-25 14:41:29 +0200 |
| commit | 4cc9052ea99fc4923ea113cca480724cda31435c (patch) | |
| tree | a756f712d568a6b3127fbd9c79674bdc4197956d /cpp/src/Ice/RetryQueue.cpp | |
| parent | Fixed IceSSL NullReferenceException in C# (diff) | |
| download | ice-4cc9052ea99fc4923ea113cca480724cda31435c.tar.bz2 ice-4cc9052ea99fc4923ea113cca480724cda31435c.tar.xz ice-4cc9052ea99fc4923ea113cca480724cda31435c.zip | |
Fixed previous fix for adapterDeactivation test warnings
Diffstat (limited to 'cpp/src/Ice/RetryQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/RetryQueue.cpp | 2 |
1 files changed, 1 insertions, 1 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 |