diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 11:36:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 11:36:52 +0200 |
| commit | e571c09451b73a52cba24a8da127b4e710f91241 (patch) | |
| tree | 34832352a1cc9c0d60ff3fdf1eee062f0884bf77 /cpp/src/Ice/IncomingAsync.cpp | |
| parent | Link libraries on Linux with --no-undefined (diff) | |
| download | ice-e571c09451b73a52cba24a8da127b4e710f91241.tar.bz2 ice-e571c09451b73a52cba24a8da127b4e710f91241.tar.xz ice-e571c09451b73a52cba24a8da127b4e710f91241.zip | |
Ported interceptor and ICE-6980 changes to java-compat
Diffstat (limited to 'cpp/src/Ice/IncomingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/IncomingAsync.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index d9bcbc5b797..c1754c582ea 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -87,18 +87,19 @@ IceInternal::IncomingAsync::create(Incoming& in) void IceInternal::IncomingAsync::ice_exception(const ::std::exception& exc) { - for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) + try { - try + for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) { if(!(*p)->exception(exc)) { return; } } - catch(...) - { - } + } + catch(...) + { + return; } checkResponseSent(); @@ -108,18 +109,19 @@ IceInternal::IncomingAsync::ice_exception(const ::std::exception& exc) void IceInternal::IncomingAsync::ice_exception() { - for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) + try { - try + for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) { if(!(*p)->exception()) { return; } } - catch(...) - { - } + } + catch(...) + { + return; } checkResponseSent(); |