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/ProxyFactory.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/ProxyFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ProxyFactory.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index b38e281622a..68ca8b02598 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -211,6 +211,16 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co } // + // Don't retry if the communicator is destroyed or object adapter + // deactivated. + // + if(dynamic_cast<const CommunicatorDestroyedException*>(&ex) || + dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex)) + { + ex.ice_throw(); + } + + // // Don't retry invocation timeouts. // if(dynamic_cast<const InvocationTimeoutException*>(&ex)) |