diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-11-10 16:24:17 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-11-10 16:24:17 +0000 |
| commit | e2233a55ee757d8ba19b560dd8de98ba3f737423 (patch) | |
| tree | 34cfad84fbba69510c66e2ef15e8885175c10c7a /java/ssl/jdk1.4 | |
| parent | adding ice_print to exceptions (diff) | |
| download | ice-e2233a55ee757d8ba19b560dd8de98ba3f737423.tar.bz2 ice-e2233a55ee757d8ba19b560dd8de98ba3f737423.tar.xz ice-e2233a55ee757d8ba19b560dd8de98ba3f737423.zip | |
Fixes to ignnore IPv6 addresses
Diffstat (limited to 'java/ssl/jdk1.4')
| -rw-r--r-- | java/ssl/jdk1.4/IceSSL/AcceptorI.java | 4 | ||||
| -rw-r--r-- | java/ssl/jdk1.4/IceSSL/EndpointI.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/ssl/jdk1.4/IceSSL/AcceptorI.java b/java/ssl/jdk1.4/IceSSL/AcceptorI.java index 777439135a2..08f55ee80ba 100644 --- a/java/ssl/jdk1.4/IceSSL/AcceptorI.java +++ b/java/ssl/jdk1.4/IceSSL/AcceptorI.java @@ -292,8 +292,8 @@ class AcceptorI implements IceInternal.Acceptor String s = "attempting to bind to ssl socket " + toString(); _logger.trace(_instance.networkTraceCategory(), s); } - java.net.InetAddress iface = java.net.InetAddress.getByName(host); - _fd = (javax.net.ssl.SSLServerSocket)factory.createServerSocket(port, _backlog, iface); + java.net.InetSocketAddress iface = IceInternal.Network.getAddress(host, port); + _fd = (javax.net.ssl.SSLServerSocket)factory.createServerSocket(port, _backlog, iface.getAddress()); _addr = (java.net.InetSocketAddress)_fd.getLocalSocketAddress(); int verifyPeer = diff --git a/java/ssl/jdk1.4/IceSSL/EndpointI.java b/java/ssl/jdk1.4/IceSSL/EndpointI.java index 06aacbebb9a..6f934eca015 100644 --- a/java/ssl/jdk1.4/IceSSL/EndpointI.java +++ b/java/ssl/jdk1.4/IceSSL/EndpointI.java @@ -547,10 +547,10 @@ final class EndpointI extends IceInternal.EndpointI { try { - java.net.InetAddress addr = java.net.InetAddress.getByName(_host); - _hashCode = addr.getHostAddress().hashCode(); + java.net.InetSocketAddress addr = IceInternal.Network.getAddress(_host, _port); + _hashCode = addr.getAddress().getHostAddress().hashCode(); } - catch(java.net.UnknownHostException ex) + catch(Ice.DNSException ex) { _hashCode = _host.hashCode(); } |