diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-12 10:03:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-12 10:03:29 +0100 |
| commit | 15243f5d52cbcef1c2bcddbdfe1faa5fcf83c0a7 (patch) | |
| tree | cfb55a8b546ac3abb6a0b5542bb1f7b5eb794815 /cpp/src/Ice/Outgoing.cpp | |
| parent | Bump expect/expectall default timeouts (diff) | |
| download | ice-15243f5d52cbcef1c2bcddbdfe1faa5fcf83c0a7.tar.bz2 ice-15243f5d52cbcef1c2bcddbdfe1faa5fcf83c0a7.tar.xz ice-15243f5d52cbcef1c2bcddbdfe1faa5fcf83c0a7.zip | |
Fixed ICE-6142: oneway batch operations didn't throw
Diffstat (limited to 'cpp/src/Ice/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 9589f724f43..8f06faba26b 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -679,14 +679,10 @@ FlushBatch::invoke() _exception->ice_throw(); } } - catch(const RetryException&) + catch(const RetryException& ex) { - // - // Clear request handler but don't retry or throw. Retrying - // isn't useful, there were no batch requests associated with - // the proxy's request handler. - // - _proxy->__setRequestHandler(handler, 0); + _proxy->__setRequestHandler(handler, 0); // Clear request handler + ex.get()->ice_throw(); // Throw to notify the user that batch requests were potentially lost. } catch(const Ice::Exception& ex) { |