From 4cc9052ea99fc4923ea113cca480724cda31435c Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 25 Sep 2014 14:41:29 +0200
Subject: Fixed previous fix for adapterDeactivation test warnings

---
 cpp/src/Ice/RetryQueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpp/src')

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
-- 
cgit v1.2.3