diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 18:06:54 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 18:06:54 +0100 |
| commit | 5a57686d2ccbb085b8ac67908ad9525a6bafaf4b (patch) | |
| tree | 58c2219412e8af66fbfd66d5269af6b7a48b28d2 /cpp/src/Ice/IncomingAsync.cpp | |
| parent | Avoid check_output isn't supported with python 2.6 (diff) | |
| download | ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.bz2 ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.xz ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.zip | |
Fixed ICE-6199 - changed collocation optimization to call AMI cb asynchronously if AMD dispatch
Diffstat (limited to 'cpp/src/Ice/IncomingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/IncomingAsync.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index 10c0ec6ac4e..7b56ab244fc 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -191,7 +191,7 @@ IceInternal::IncomingAsync::__response() { try { - if(_locator && !__servantLocatorFinished()) + if(_locator && !__servantLocatorFinished(true)) { return; } @@ -201,7 +201,7 @@ IceInternal::IncomingAsync::__response() if(_response) { _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); - _responseHandler->sendResponse(_current.requestId, &_os, _compress); + _responseHandler->sendResponse(_current.requestId, &_os, _compress, true); } else { @@ -213,7 +213,7 @@ IceInternal::IncomingAsync::__response() } catch(const LocalException& ex) { - _responseHandler->invokeException(_current.requestId, ex, 1); // Fatal invocation exception + _responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception } } @@ -222,16 +222,16 @@ IceInternal::IncomingAsync::__exception(const std::exception& exc) { try { - if(_locator && !__servantLocatorFinished()) + if(_locator && !__servantLocatorFinished(true)) { return; } - __handleException(exc); + __handleException(exc, true); } catch(const LocalException& ex) { - _responseHandler->invokeException(_current.requestId, ex, 1); // Fatal invocation exception + _responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception } } @@ -240,16 +240,16 @@ IceInternal::IncomingAsync::__exception() { try { - if(_locator && !__servantLocatorFinished()) + if(_locator && !__servantLocatorFinished(true)) { return; } - __handleException(); + __handleException(true); } catch(const LocalException& ex) { - _responseHandler->invokeException(_current.requestId, ex, 1); // Fatal invocation exception + _responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception } } |