summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/TcpEndpointI.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceInternal/TcpEndpointI.java')
-rw-r--r--java/src/IceInternal/TcpEndpointI.java25
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()
{