From df397ce2bdc44b6a8cd3e100317c5390994bdde2 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 18 Oct 2004 12:36:27 +0000 Subject: Inet4Address.java: Merged file header and javadocs. 2004-10-18 Michael Koch * java/net/Inet4Address.java: Merged file header and javadocs. * java/net/Inet6Address.java: Likewise. * java/net/InetAddress.java (getCanonicalHostName): Create Inet4Address object instead of InetAddress and add comment regarding IPv6. (toString): Simplified. From-SVN: r89211 --- libjava/java/net/InetAddress.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libjava/java/net/InetAddress.java') diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 51bcf3ae6ec..06e1a240abd 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -313,7 +313,7 @@ public class InetAddress implements Serializable { try { - sm.checkConnect (hostName, -1); + sm.checkConnect(hostName, -1); } catch (SecurityException e) { @@ -322,7 +322,8 @@ public class InetAddress implements Serializable } // Try to find the FDQN now - InetAddress address = new InetAddress (getAddress(), null); + // FIXME: This does not work with IPv6. + InetAddress address = new Inet4Address(getAddress(), null); return address.getHostName(); } @@ -487,14 +488,8 @@ public class InetAddress implements Serializable */ public String toString() { - String host; String address = getHostAddress(); - - if (hostName != null) - host = hostName; - else - host = address; - + String host = (hostName != null) ? hostName : address; return host + "/" + address; } -- cgit v1.2.3