summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ConnectionRequestHandler.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-09-03 11:01:11 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-09-03 11:01:11 -0230
commit3b0588532354adf7bf3b86e611a8ae4996bfe6ad (patch)
tree253961cb83af7bc3b1dfc7633a8f934789476cd1 /java/src/IceInternal/ConnectionRequestHandler.java
parentMore work on ICE-2400: the send log thread now uses a separate communicator t... (diff)
downloadice-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/ConnectionRequestHandler.java')
-rw-r--r--java/src/IceInternal/ConnectionRequestHandler.java33
1 files changed, 10 insertions, 23 deletions
diff --git a/java/src/IceInternal/ConnectionRequestHandler.java b/java/src/IceInternal/ConnectionRequestHandler.java
index 4dcf9db63e8..5494b6f70e3 100644
--- a/java/src/IceInternal/ConnectionRequestHandler.java
+++ b/java/src/IceInternal/ConnectionRequestHandler.java
@@ -13,44 +13,31 @@ public class ConnectionRequestHandler implements RequestHandler
{
@Override
public void
- prepareBatchRequest(BasicStream out) throws RetryException {
+ prepareBatchRequest(BasicStream out)
+ throws RetryException
+ {
_connection.prepareBatchRequest(out);
}
@Override
public void
- finishBatchRequest(BasicStream out) {
+ finishBatchRequest(BasicStream out)
+ {
_connection.finishBatchRequest(out, _compress);
}
@Override
public void
- abortBatchRequest() {
+ abortBatchRequest()
+ {
_connection.abortBatchRequest();
}
@Override
- public boolean
- sendRequest(OutgoingMessageCallback out)
- throws RetryException {
- //
- // Finished if sent and no response.
- //
- return out.send(_connection, _compress, _response) && !_response;
- }
-
- @Override
- public int
- sendAsyncRequest(OutgoingAsyncMessageCallback out)
- throws RetryException {
- return out.__send(_connection, _compress, _response);
- }
-
- @Override
- public boolean
- requestCanceled(OutgoingMessageCallback out, Ice.LocalException ex)
+ public int sendAsyncRequest(OutgoingAsyncMessageCallback out)
+ throws RetryException
{
- return _connection.requestCanceled(out, ex);
+ return out.send(_connection, _compress, _response);
}
@Override