diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-09-03 16:54:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-09-03 16:54:28 +0200 |
| commit | 3a0366354071a3acfdf93158732938f943339d65 (patch) | |
| tree | af319b72556ba9736063447f48dc5324a0c57c81 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Fixes for slice2py forward declarations - Close #490 (diff) | |
| download | ice-3a0366354071a3acfdf93158732938f943339d65.tar.bz2 ice-3a0366354071a3acfdf93158732938f943339d65.tar.xz ice-3a0366354071a3acfdf93158732938f943339d65.zip | |
Fixed retry bug with -2 invocation timeout, fixes #501
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 0672fb1b833..44ba61e9527 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -364,9 +364,9 @@ OutgoingAsyncBase::cancel(const Ice::LocalException& ex) CancellationHandlerPtr handler; { Lock sync(_m); - ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone()); if(!_cancellationHandler) { + ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone()); return; } handler = _cancellationHandler; |