diff options
author | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
commit | 3b0588532354adf7bf3b86e611a8ae4996bfe6ad (patch) | |
tree | 253961cb83af7bc3b1dfc7633a8f934789476cd1 /java/src/IceInternal/ProxyBatchOutgoingAsync.java | |
parent | More work on ICE-2400: the send log thread now uses a separate communicator t... (diff) | |
download | ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.bz2 ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.xz ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.zip |
- C#, Java: Removed Outgoing, fixed generated code to make synchronous
requests using AMI.
- Java: AsyncResult is now an interface.
- Added --arg to allTests.py.
- Fixed operations, adapterDeactivation and metrics test to work with
background IO.
- Added Collocated interrupt test.
- Added support for batch oneway requests using AMI.
- Added test in operations for batch oneway requests using AMI.
Diffstat (limited to 'java/src/IceInternal/ProxyBatchOutgoingAsync.java')
-rw-r--r-- | java/src/IceInternal/ProxyBatchOutgoingAsync.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/src/IceInternal/ProxyBatchOutgoingAsync.java b/java/src/IceInternal/ProxyBatchOutgoingAsync.java index 4f24a1919e6..009319110fe 100644 --- a/java/src/IceInternal/ProxyBatchOutgoingAsync.java +++ b/java/src/IceInternal/ProxyBatchOutgoingAsync.java @@ -32,20 +32,26 @@ public class ProxyBatchOutgoingAsync extends BatchOutgoingAsync _sentSynchronously = true; if((status & AsyncStatus.InvokeSentCallback) > 0) { - __invokeSent(); + invokeSent(); } } else { synchronized(_monitor) { - if((_state & Done) == 0) + if((_state & StateDone) == 0) { int invocationTimeout = handler.getReference().getInvocationTimeout(); if(invocationTimeout > 0) { - _future = _instance.timer().schedule(this, invocationTimeout, - java.util.concurrent.TimeUnit.MILLISECONDS); + _future = _instance.timer().schedule(new Runnable() + { + @Override + public void run() + { + timeout(); + } + }, invocationTimeout, java.util.concurrent.TimeUnit.MILLISECONDS); _timeoutRequestHandler = handler; } } |