diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
| commit | b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80 (patch) | |
| tree | d3e9e9340064538a8dc7a645260d0eb3cdf55d63 /java/src/IceInternal/TcpConnector.java | |
| parent | Undo bogus change from an earlier commit. (diff) | |
| download | ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.bz2 ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.xz ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.zip | |
ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networking code (addition of StreamSocket class abstraction)
Diffstat (limited to 'java/src/IceInternal/TcpConnector.java')
| -rw-r--r-- | java/src/IceInternal/TcpConnector.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index 0ace406c1e8..8c4c6ccabd7 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -14,12 +14,7 @@ final class TcpConnector implements Connector @Override public Transceiver connect() { - 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); + return new TcpTransceiver(_instance, new StreamSocket(_instance, _proxy, _addr, _sourceAddr)); } @Override |