2 files changed, 37 insertions, 12 deletions

diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index 19fa86c61d5..6d58bc66fda 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -26,10 +26,15 @@ IceInternal::RetryTask::RetryTask(const RetryQueuePtr& queue, const OutgoingAsyn
 void
 IceInternal::RetryTask::runTimerTask()
 {
-    if(_queue->remove(this))
-    {
-        _outAsync->__processRetry(false);
-    }
+    _outAsync->__processRetry(false);
+
+    //
+    // NOTE: this must be called last, destroy() blocks until all task
+    // are removed to prevent the client thread pool to be destroyed
+    // (we still need the client thread pool at this point to call
+    // exception callbacks with CommunicatorDestroyedException).
+    //
+    _queue->remove(this);
 }
 
 void
@@ -72,19 +77,39 @@ void
 IceInternal::RetryQueue::destroy()
 {
     Lock sync(*this);
-    for(set<RetryTaskPtr>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
+    assert(_instance);
+
+    set<RetryTaskPtr>::const_iterator p = _requests.begin();
+    while(p != _requests.end())
     {
-        _instance->timer()->cancel(*p);
-        (*p)->destroy();
+        if(_instance->timer()->cancel(*p))
+        {
+            (*p)->destroy();
+            _requests.erase(p++);
+        }
+        else
+        {
+            ++p;
+        }
     }
-    _requests.clear();
+
     _instance = 0;
+    while(!_requests.empty())
+    {
+        wait();
+    }
 }
 
-bool
+void
 IceInternal::RetryQueue::remove(const RetryTaskPtr& task)
 {
     Lock sync(*this);
-    return _requests.erase(task) > 0;
+    assert(_requests.find(task) != _requests.end());
+    _requests.erase(task);
+    if(!_instance && _requests.empty())
+    {
+        notify(); // If we are destroying the queue, destroy is probably waiting on the queue to be empty.
+    }
 }
 
+
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index 07307310c8d..ecb1b5dd7c1 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -38,7 +38,7 @@ private:
 };
 typedef IceUtil::Handle<RetryTask> RetryTaskPtr;
 
-class RetryQueue : public IceUtil::Shared, public IceUtil::Mutex
+class RetryQueue : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -49,7 +49,7 @@ public:
 
 private:
 
-    bool remove(const RetryTaskPtr&);
+    void remove(const RetryTaskPtr&);
     friend class RetryTask;
 
     InstancePtr _instance;