diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 11:17:34 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 11:17:34 +0100 |
| commit | 18ab8207bd14def950fd399c60d9ee54fab75d3b (patch) | |
| tree | a82af333127184acc6be6e0969919cb20be5e8b3 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed ICE-7548 - getAdminProxy no longer returns 0 if synchronization is in p... (diff) | |
| download | ice-18ab8207bd14def950fd399c60d9ee54fab75d3b.tar.bz2 ice-18ab8207bd14def950fd399c60d9ee54fab75d3b.tar.xz ice-18ab8207bd14def950fd399c60d9ee54fab75d3b.zip | |
Fixed ICE-7169 and ICE-7375 - add option to specify if batch requests flushed with the communicator/connection should be compressed
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index ac60baa4a0c..e7c6e529095 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -9,6 +9,7 @@ #include <Ice/UUID.h> #include <Ice/ObjectAdapterI.h> +#include <Ice/CommunicatorI.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/Instance.h> #include <Ice/Proxy.h> @@ -786,7 +787,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const } void -Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) +Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync, CompressBatch compress) { vector<IncomingConnectionFactoryPtr> f; { @@ -796,7 +797,7 @@ Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPt for(vector<IncomingConnectionFactoryPtr>::const_iterator p = f.begin(); p != f.end(); ++p) { - (*p)->flushAsyncBatchRequests(outAsync); + (*p)->flushAsyncBatchRequests(outAsync, compress); } } |