diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-25 12:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-25 12:24:57 +0200 |
| commit | 356e14707a342da8102b731503c8f2628c1cc79b (patch) | |
| tree | b15b837cad964f6ab3a66670ac6eb89a1d832677 /cpp/src/Ice/RetryQueue.cpp | |
| parent | Fixed compilation problem with Ruby on OS X (diff) | |
| download | ice-356e14707a342da8102b731503c8f2628c1cc79b.tar.bz2 ice-356e14707a342da8102b731503c8f2628c1cc79b.tar.xz ice-356e14707a342da8102b731503c8f2628c1cc79b.zip | |
Fixed ICE-5687 - adapterDeactivation test warnings
Diffstat (limited to 'cpp/src/Ice/RetryQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/RetryQueue.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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); |