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 /java/src/Ice/ObjectAdapterI.java | |
| 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 'java/src/Ice/ObjectAdapterI.java')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 7538fc16ced..48ad2739082 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -13,8 +13,6 @@ import java.util.Map; public final class ObjectAdapterI implements ObjectAdapter { - - @Override public String getName() @@ -751,7 +749,7 @@ public final class ObjectAdapterI implements ObjectAdapter } public void - flushAsyncBatchRequests(IceInternal.CommunicatorBatchOutgoingAsync outAsync) + flushAsyncBatchRequests(IceInternal.CommunicatorFlushBatch outAsync) { java.util.List<IceInternal.IncomingConnectionFactory> f; synchronized(this) |