diff options
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/IceInternal/Network.java | 35 | ||||
-rw-r--r-- | java/src/IceInternal/TcpEndpointI.java | 25 | ||||
-rw-r--r-- | java/src/IceInternal/UdpEndpointI.java | 25 |
3 files changed, 4 insertions, 81 deletions
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index cfa52fa0e4c..92a1547d234 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -654,41 +654,6 @@ public final class Network } public static java.util.ArrayList - getHosts(String host) - { - java.util.ArrayList hosts = new java.util.ArrayList(); - try - { - java.net.InetAddress[] addrs = java.net.InetAddress.getAllByName(host); - for(int i = 0; i < addrs.length; ++i) - { - if(addrs[i] instanceof java.net.Inet4Address) - { - hosts.add(addrs[i].getHostAddress()); - } - } - } - catch(java.net.UnknownHostException ex) - { - Ice.DNSException e = new Ice.DNSException(); - e.host = host; - throw e; - } - - // - // No Inet4Address available. - // - if(hosts.size() == 0) - { - Ice.DNSException e = new Ice.DNSException(); - e.host = host; - throw e; - } - - return hosts; - } - - public static java.util.ArrayList getLocalHosts() { java.util.ArrayList hosts = new java.util.ArrayList(); diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java index e83c38ac416..21eb90d067c 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/IceInternal/TcpEndpointI.java @@ -388,29 +388,8 @@ final class TcpEndpointI extends EndpointI } else { - if(!server) - { - java.util.ArrayList hosts = Network.getHosts(_host); - if(hosts.size() > 1) - { - java.util.Iterator iter = hosts.iterator(); - while(iter.hasNext()) - { - String host = (String)iter.next(); - endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress, true)); - } - } - else - { - calcHashValue(); - endps.add(this); - } - } - else - { - calcHashValue(); - endps.add(this); - } + calcHashValue(); + endps.add(this); } return endps; } diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java index 44f3a01b5c0..6207a0499b8 100644 --- a/java/src/IceInternal/UdpEndpointI.java +++ b/java/src/IceInternal/UdpEndpointI.java @@ -523,29 +523,8 @@ final class UdpEndpointI extends EndpointI } else { - if(!server) - { - java.util.ArrayList hosts = Network.getHosts(_host); - if(hosts.size() > 1) - { - java.util.Iterator iter = hosts.iterator(); - while(iter.hasNext()) - { - String host = (String)iter.next(); - endps.add(new UdpEndpointI(_instance, host, _port, _connect, _connectionId, _compress, true)); - } - } - else - { - calcHashValue(); - endps.add(this); - } - } - else - { - calcHashValue(); - endps.add(this); - } + calcHashValue(); + endps.add(this); } return endps; } |