diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-01-30 13:45:21 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-01-30 13:45:21 -0800 |
| commit | 61270a10f980933cf582edb766f10c8ac6d86e8a (patch) | |
| tree | 45ab4a7c2986954054fce613bc3c8f7967e7951e /cpp/src/Ice/ProxyFactory.cpp | |
| parent | Fix slice2cpp build failure (diff) | |
| download | ice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.bz2 ice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.xz ice-61270a10f980933cf582edb766f10c8ac6d86e8a.zip | |
merging IceBridge into master
Diffstat (limited to 'cpp/src/Ice/ProxyFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ProxyFactory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index eba949508b6..34503ec961b 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -201,11 +201,12 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co } // - // Don't retry if the communicator is destroyed or object adapter - // deactivated. + // Don't retry if the communicator is destroyed, object adapter is deactivated, + // or connection is manually closed. // if(dynamic_cast<const CommunicatorDestroyedException*>(&ex) || - dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex)) + dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex) || + dynamic_cast<const ConnectionManuallyClosedException*>(&ex)) { ex.ice_throw(); } |