diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-04-21 17:57:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-04-21 17:57:07 +0200 |
| commit | 0d9e14a134cba4ce19f40103e9c9615e1b0a7a86 (patch) | |
| tree | a75fbec57a387ed4236eec8d5251495b7cbd7afa /cpp/src/Ice/ProxyFactory.cpp | |
| parent | Fixed potential IceUtil::NullHandleException (diff) | |
| download | ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.tar.bz2 ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.tar.xz ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.zip | |
Fixed bug 2972 & 3013
Diffstat (limited to 'cpp/src/Ice/ProxyFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ProxyFactory.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index 48e9460bada..2fc5316eb6d 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -248,7 +248,14 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, { if(out) { - _instance->timer()->schedule(new RetryTask(out), IceUtil::Time::milliSeconds(interval)); + try + { + _instance->timer()->schedule(new RetryTask(out), IceUtil::Time::milliSeconds(interval)); + } + catch(const IceUtil::IllegalArgumentException&) // Expected if the communicator destroyed the timer. + { + throw CommunicatorDestroyedException(__FILE__, __LINE__); + } } else { |