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 /objective-c/src | |
| 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 'objective-c/src')
| -rw-r--r-- | objective-c/src/Ice/CommunicatorI.mm | 18 | ||||
| -rw-r--r-- | objective-c/src/Ice/ConnectionI.mm | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/objective-c/src/Ice/CommunicatorI.mm b/objective-c/src/Ice/CommunicatorI.mm index 5bd82866953..050e5d9b0e7 100644 --- a/objective-c/src/Ice/CommunicatorI.mm +++ b/objective-c/src/Ice/CommunicatorI.mm @@ -445,12 +445,12 @@ { @throw [ICEFeatureNotSupportedException featureNotSupportedException:__FILE__ line:__LINE__]; } --(void) flushBatchRequests +-(void) flushBatchRequests:(ICECompressBatch)compress { NSException* nsex = nil; try { - COMMUNICATOR->flushBatchRequests(); + COMMUNICATOR->flushBatchRequests((Ice::CompressBatch)compress); } catch(const std::exception& ex) { @@ -461,22 +461,24 @@ @throw nsex; } } --(id<ICEAsyncResult>) begin_flushBatchRequests +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress { return beginCppCall(^(Ice::AsyncResultPtr& result) { - result = COMMUNICATOR->begin_flushBatchRequests(); + result = COMMUNICATOR->begin_flushBatchRequests((Ice::CompressBatch)compress); }); } --(id<ICEAsyncResult>) begin_flushBatchRequests:(void(^)(ICEException*))exception +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress exception:(void(^)(ICEException*))exception { - return [self begin_flushBatchRequests:exception sent:nil]; + return [self begin_flushBatchRequests:compress exception:exception sent:nil]; } --(id<ICEAsyncResult>) begin_flushBatchRequests:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress + exception:(void(^)(ICEException*))exception + sent:(void(^)(BOOL))sent { return beginCppCall(^(Ice::AsyncResultPtr& result, const Ice::CallbackPtr& cb) { - result = COMMUNICATOR->begin_flushBatchRequests(cb); + result = COMMUNICATOR->begin_flushBatchRequests((Ice::CompressBatch)compress, cb); }, ^(const Ice::AsyncResultPtr& result) { COMMUNICATOR->end_flushBatchRequests(result); diff --git a/objective-c/src/Ice/ConnectionI.mm b/objective-c/src/Ice/ConnectionI.mm index 07f6b6be8bd..f1775726ee8 100644 --- a/objective-c/src/Ice/ConnectionI.mm +++ b/objective-c/src/Ice/ConnectionI.mm @@ -326,12 +326,12 @@ private: @throw nsex; return nil; // Keep the compiler happy. } --(void) flushBatchRequests +-(void) flushBatchRequests:(ICECompressBatch)compress { NSException* nsex = nil; try { - CONNECTION->flushBatchRequests(); + CONNECTION->flushBatchRequests((Ice::CompressBatch)compress); } catch(const std::exception& ex) { @@ -342,22 +342,24 @@ private: @throw nsex; } } --(id<ICEAsyncResult>) begin_flushBatchRequests +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress { return beginCppCall(^(Ice::AsyncResultPtr& result) { - result = CONNECTION->begin_flushBatchRequests(); + result = CONNECTION->begin_flushBatchRequests((Ice::CompressBatch)compress); }); } --(id<ICEAsyncResult>) begin_flushBatchRequests:(void(^)(ICEException*))exception +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress exception:(void(^)(ICEException*))exception { - return [self begin_flushBatchRequests:exception sent:nil]; + return [self begin_flushBatchRequests:compress exception:exception sent:nil]; } --(id<ICEAsyncResult>) begin_flushBatchRequests:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent +-(id<ICEAsyncResult>) begin_flushBatchRequests:(ICECompressBatch)compress + exception:(void(^)(ICEException*))exception + sent:(void(^)(BOOL))sent { return beginCppCall(^(Ice::AsyncResultPtr& result, const Ice::CallbackPtr& cb) { - result = CONNECTION->begin_flushBatchRequests(cb); + result = CONNECTION->begin_flushBatchRequests((Ice::CompressBatch)compress, cb); }, ^(const Ice::AsyncResultPtr& result) { CONNECTION->end_flushBatchRequests(result); |