From 356e14707a342da8102b731503c8f2628c1cc79b Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 25 Sep 2014 12:24:57 +0200
Subject: Fixed ICE-5687 - adapterDeactivation test warnings

---
 cpp/src/Ice/RetryQueue.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cpp/src/Ice/RetryQueue.cpp')

diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index 730b15ba73d..785a650f7f0 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -52,6 +52,10 @@ void
 IceInternal::RetryQueue::add(const OutgoingAsyncMessageCallbackPtr& out, int interval)
 {
     Lock sync(*this);
+    if(!_instance)
+    {
+        throw CommunicatorDestroyedException(__FILE__, __LINE__);
+    }
     RetryTaskPtr task = new RetryTask(this, out);
     try
     {
@@ -68,6 +72,7 @@ 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);
-- 
cgit v1.2.3