diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
| commit | 570455a381e6620f8ddfcca448559d3fa545ba38 (patch) | |
| tree | fe3fa45e6a643b473d9370babff6224b1a9d4dcb /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed ICE-5726: provide deprecated public StringConverterPlugin (diff) | |
| download | ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.bz2 ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.xz ice-570455a381e6620f8ddfcca448559d3fa545ba38.zip | |
Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel()
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 422cdb8fd01..c9a05c091ca 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -743,7 +743,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const } void -Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorBatchOutgoingAsyncPtr& outAsync) +Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) { vector<IncomingConnectionFactoryPtr> f; { |