diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
| commit | 344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8 (patch) | |
| tree | bd06f4919e5a5827f60e2a536e43e47a4fbed6d2 /cpp/src/Ice/CollocatedRequestHandler.cpp | |
| parent | Fixed ICE-5569: IceStorm IceMX debug iterator assert (diff) | |
| download | ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.bz2 ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.xz ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.zip | |
IceMX and Python support for the new collocation optimization
Diffstat (limited to 'cpp/src/Ice/CollocatedRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/CollocatedRequestHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 6db9bae4daf..896062a4d42 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -358,7 +358,7 @@ CollocatedRequestHandler::invokeRequest(Outgoing* out) } } - out->attachCollocatedObserver(requestId); + out->attachCollocatedObserver(_adapter, requestId); if(_reference->getInvocationTimeout() > 0) { @@ -389,7 +389,7 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsync* outAsync) } } - outAsync->__attachCollocatedObserver(requestId); + outAsync->__attachCollocatedObserver(_adapter, requestId); _adapter->getThreadPool()->execute(new InvokeAllAsync(outAsync, outAsync->__getOs(), this, requestId, 1, false)); return AsyncStatusQueued; @@ -428,7 +428,7 @@ CollocatedRequestHandler::invokeBatchRequests(BatchOutgoing* out) } } - out->attachCollocatedObserver(0); + out->attachCollocatedObserver(_adapter, 0); if(invokeNum > 0) { @@ -480,7 +480,7 @@ CollocatedRequestHandler::invokeAsyncBatchRequests(BatchOutgoingAsync* outAsync) } } - outAsync->__attachCollocatedObserver(0); + outAsync->__attachCollocatedObserver(_adapter, 0); if(invokeNum > 0) { |