diff options
author | Matthew Newhook <matthew@zeroc.com> | 2014-08-07 14:36:07 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-07 14:36:07 -0230 |
commit | b36ae21c88735cbd2c39c5ccde2572a8fcc4e928 (patch) | |
tree | dfd5eee6e7d61a9c6efcbaabe916639009aaa9af /java/src/IceInternal/TcpTransceiver.java | |
parent | Add @Override where possible, and remove trailing white space. (diff) | |
download | ice-b36ae21c88735cbd2c39c5ccde2572a8fcc4e928.tar.bz2 ice-b36ae21c88735cbd2c39c5ccde2572a8fcc4e928.tar.xz ice-b36ae21c88735cbd2c39c5ccde2572a8fcc4e928.zip |
ICE-1593 Handling thread interrupts in Java
- Added Ice.BackgroundIO property to perform all IO in a non-user
thread. This makes Ice for Java interrupt safe. This is implemented
by the QueueRequestHanbler.
- EndpointHostResolver now uses an executor instead of a thread.
- Added java/demo/Ice/interrupt and java/test/Ice/interrupt.
- Made several changes that must be ported to C++ & C#.
- InvocationTimeout exceptions can hang forever.
- Connection establishment is always asynchronous.
- RequestHandler.requestTimeout and asyncRequestTimeout have been
renamed to requestCancel and asyncRequestCancel.
Diffstat (limited to 'java/src/IceInternal/TcpTransceiver.java')
-rw-r--r-- | java/src/IceInternal/TcpTransceiver.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java index bdaa5bca9a1..135299ebbc7 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/IceInternal/TcpTransceiver.java @@ -154,7 +154,6 @@ final class TcpTransceiver implements Transceiver } @Override - @SuppressWarnings("deprecation") public int write(Buffer buf) { final int size = buf.b.limit(); @@ -240,7 +239,6 @@ final class TcpTransceiver implements Transceiver } @Override - @SuppressWarnings("deprecation") public int read(Buffer buf, Ice.BooleanHolder moreData) { int packetSize = buf.b.remaining(); @@ -254,8 +252,8 @@ final class TcpTransceiver implements Transceiver try { assert(_fd != null); - int ret = _fd.read(buf.b); + int ret = _fd.read(buf.b); if(ret == -1) { throw new Ice.ConnectionLostException(); @@ -330,7 +328,6 @@ final class TcpTransceiver implements Transceiver } } - @SuppressWarnings("deprecation") TcpTransceiver(ProtocolInstance instance, java.nio.channels.SocketChannel fd, NetworkProxy proxy, java.net.InetSocketAddress addr) { @@ -357,7 +354,6 @@ final class TcpTransceiver implements Transceiver } } - @SuppressWarnings("deprecation") TcpTransceiver(ProtocolInstance instance, java.nio.channels.SocketChannel fd) { _instance = instance; |