diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-12 15:49:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-12 15:49:38 +0200 |
| commit | e241ec05ad9c674266e2069e92e1f5cdc7a6fd6a (patch) | |
| tree | ebcd4db2b7d51ba6d0978035924136c23b442b0b /cpp/src/Ice/CollocatedRequestHandler.cpp | |
| parent | Fix ICE-7334 - Python Ice/optional cross test hang (diff) | |
| parent | Fixed ICE-7336 - dispatcher test failure (diff) | |
| download | ice-e241ec05ad9c674266e2069e92e1f5cdc7a6fd6a.tar.bz2 ice-e241ec05ad9c674266e2069e92e1f5cdc7a6fd6a.tar.xz ice-e241ec05ad9c674266e2069e92e1f5cdc7a6fd6a.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/CollocatedRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/CollocatedRequestHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index ee35365b042..08d2d2f8aa0 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -172,11 +172,11 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba if(!synchronous || !_response || _reference->getInvocationTimeout() > 0) { // Don't invoke from the user thread if async or invocation timeout is set - _adapter->getThreadPool()->dispatch(new InvokeAllAsync(ICE_GET_SHARED_FROM_THIS(outAsync), - outAsync->getOs(), - ICE_SHARED_FROM_THIS, - requestId, - batchRequestNum)); + _adapter->getThreadPool()->dispatch(new InvokeAllAsync(ICE_GET_SHARED_FROM_THIS(outAsync), + outAsync->getOs(), + ICE_SHARED_FROM_THIS, + requestId, + batchRequestNum)); } else if(_dispatcher) { |