diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-11 16:06:49 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-11 16:06:49 -0700 |
| commit | 5b0880e399cffc38f83f7a610ef68d4c6af65b2d (patch) | |
| tree | b7bd2e8a67e779ab8578ba06c30b1ae9d31a898e /java/src/IceInternal/TcpEndpointI.java | |
| parent | Fixed (ICE-5327) - Using completed or sent as variable names causes badness (diff) | |
| download | ice-5b0880e399cffc38f83f7a610ef68d4c6af65b2d.tar.bz2 ice-5b0880e399cffc38f83f7a610ef68d4c6af65b2d.tar.xz ice-5b0880e399cffc38f83f7a610ef68d4c6af65b2d.zip | |
SOCKS support for Java
Diffstat (limited to 'java/src/IceInternal/TcpEndpointI.java')
| -rw-r--r-- | java/src/IceInternal/TcpEndpointI.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java index 5030431f7fb..3b99a9b6a05 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/IceInternal/TcpEndpointI.java @@ -392,8 +392,7 @@ final class TcpEndpointI extends EndpointI public java.util.List<Connector> connectors(Ice.EndpointSelectionType selType) { - return connectors(Network.getAddresses(_host, _port, _instance.protocolSupport(), selType, - _instance.preferIPv6())); + return _instance.endpointHostResolver().resolve(_host, _port, selType, this); } public void @@ -454,6 +453,17 @@ final class TcpEndpointI extends EndpointI return tcpEndpointI._host.equals(_host) && tcpEndpointI._port == _port; } + public java.util.List<Connector> + connectors(java.util.List<java.net.InetSocketAddress> addresses, NetworkProxy proxy) + { + java.util.List<Connector> connectors = new java.util.ArrayList<Connector>(); + for(java.net.InetSocketAddress p : addresses) + { + connectors.add(new TcpConnector(_instance, p, proxy, _timeout, _connectionId)); + } + return connectors; + } + public int hashCode() { @@ -515,17 +525,6 @@ final class TcpEndpointI extends EndpointI return _host.compareTo(p._host); } - public java.util.List<Connector> - connectors(java.util.List<java.net.InetSocketAddress> addresses) - { - java.util.List<Connector> connectors = new java.util.ArrayList<Connector>(); - for(java.net.InetSocketAddress p : addresses) - { - connectors.add(new TcpConnector(_instance, p, _timeout, _connectionId)); - } - return connectors; - } - private void calcHashValue() { |