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/InvocationObserverI.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/InvocationObserverI.java')
-rw-r--r-- | java/src/IceInternal/InvocationObserverI.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/java/src/IceInternal/InvocationObserverI.java b/java/src/IceInternal/InvocationObserverI.java index 8c9ffc57d32..bf96a9c0d0d 100644 --- a/java/src/IceInternal/InvocationObserverI.java +++ b/java/src/IceInternal/InvocationObserverI.java @@ -205,10 +205,10 @@ public class InvocationObserverI delegate = _delegate.getRemoteObserver(con, edpt, requestId, sz); } return getObserver("Remote", - new RemoteInvocationHelper(con, edpt, requestId, sz), - RemoteMetrics.class, - RemoteObserverI.class, - delegate); + new RemoteInvocationHelper(con, edpt, requestId, sz), + RemoteMetrics.class, + RemoteObserverI.class, + delegate); } @Override @@ -220,12 +220,11 @@ public class InvocationObserverI { delegate = _delegate.getCollocatedObserver(adapter, requestId, sz); } - return getObserver( - "Collocated", - new CollocatedInvocationHelper(adapter, requestId, sz), - CollocatedMetrics.class, - CollocatedObserverI.class, - delegate); + return getObserver("Collocated", + new CollocatedInvocationHelper(adapter, requestId, sz), + CollocatedMetrics.class, + CollocatedObserverI.class, + delegate); } final MetricsUpdate<InvocationMetrics> _incrementRetry = new MetricsUpdate<InvocationMetrics>() |