diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-05 10:42:18 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-05 10:42:18 -0230 |
commit | 9786853ab2d88598021aaec5c0409d3a45a50a13 (patch) | |
tree | d64858749513c529fdb84a98d8637d19f2c125e4 /java/src/IceInternal/TcpConnector.java | |
parent | Minor change to JS print stack traces (diff) | |
download | ice-9786853ab2d88598021aaec5c0409d3a45a50a13.tar.bz2 ice-9786853ab2d88598021aaec5c0409d3a45a50a13.tar.xz ice-9786853ab2d88598021aaec5c0409d3a45a50a13.zip |
ICE-4891 Refactor network tracing
Diffstat (limited to 'java/src/IceInternal/TcpConnector.java')
-rw-r--r-- | java/src/IceInternal/TcpConnector.java | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index f8fca6619ba..0ace406c1e8 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -14,30 +14,12 @@ final class TcpConnector implements Connector @Override public Transceiver connect() { - if(_instance.traceLevel() >= 2) - { - String s = "trying to establish " + _instance.protocol() + " connection to " + toString(); - _instance.logger().trace(_instance.traceCategory(), s); - } - - try - { - java.nio.channels.SocketChannel fd = Network.createTcpSocket(); - Network.setBlock(fd, false); - Network.setTcpBufSize(fd, _instance.properties(), _instance.logger()); - final java.net.InetSocketAddress addr = _proxy != null ? _proxy.getAddress() : _addr; - Network.doConnect(fd, addr, _sourceAddr); - return new TcpTransceiver(_instance, fd, _proxy, _addr); - } - catch(Ice.LocalException ex) - { - if(_instance.traceLevel() >= 2) - { - String s = "failed to establish " + _instance.protocol() + " connection to " + toString() + "\n" + ex; - _instance.logger().trace(_instance.traceCategory(), s); - } - throw ex; - } + java.nio.channels.SocketChannel fd = Network.createTcpSocket(); + Network.setBlock(fd, false); + Network.setTcpBufSize(fd, _instance.properties(), _instance.logger()); + final java.net.InetSocketAddress addr = _proxy != null ? _proxy.getAddress() : _addr; + Network.doConnect(fd, addr, _sourceAddr); + return new TcpTransceiver(_instance, fd, _proxy, _addr); } @Override |