summaryrefslogtreecommitdiff
path: root/cs/src/Ice/ObjectAdapterFactory.cs
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-10-10 12:03:07 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-10-10 12:03:07 +0200
commit570455a381e6620f8ddfcca448559d3fa545ba38 (patch)
treefe3fa45e6a643b473d9370babff6224b1a9d4dcb /cs/src/Ice/ObjectAdapterFactory.cs
parentFixed ICE-5726: provide deprecated public StringConverterPlugin (diff)
downloadice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.bz2
ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.xz
ice-570455a381e6620f8ddfcca448559d3fa545ba38.zip
Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel()
Diffstat (limited to 'cs/src/Ice/ObjectAdapterFactory.cs')
-rw-r--r--cs/src/Ice/ObjectAdapterFactory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index 3dd791b1030..0b9cdb2a914 100644
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -212,7 +212,7 @@ namespace IceInternal
}
}
- public void flushAsyncBatchRequests(CommunicatorBatchOutgoingAsync outAsync)
+ public void flushAsyncBatchRequests(CommunicatorFlushBatch outAsync)
{
List<Ice.ObjectAdapterI> adapters;
lock(this)