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/ObjectAdapterFactory.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/ObjectAdapterFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 47398bc8720..2e9dd66ff0c 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -134,7 +134,7 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)()) adapters = _adapters; } #ifdef ICE_CPP11_MAPPING - for_each(adapters.begin(), adapters.end(), + for_each(adapters.begin(), adapters.end(), [fn](const ObjectAdapterIPtr& adapter) { (adapter.get() ->* fn)(); @@ -231,7 +231,8 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a } void -IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) const +IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync, + CompressBatch compressBatch) const { list<ObjectAdapterIPtr> adapters; { @@ -242,7 +243,7 @@ IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlu for(list<ObjectAdapterIPtr>::const_iterator p = adapters.begin(); p != adapters.end(); ++p) { - (*p)->flushAsyncBatchRequests(outAsync); + (*p)->flushAsyncBatchRequests(outAsync, compressBatch); } } |