diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-10-18 12:36:27 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-10-18 12:36:27 +0000 |
| commit | df397ce2bdc44b6a8cd3e100317c5390994bdde2 (patch) | |
| tree | 89879f9793d01be864028c7a7a96bf5a6aedcd8c /libjava/java/net/InetAddress.java | |
| parent | 2c661756f45c5fb1fa6e886b55ef43e2fefce5aa (diff) | |
| download | gcc-df397ce2bdc44b6a8cd3e100317c5390994bdde2.zip gcc-df397ce2bdc44b6a8cd3e100317c5390994bdde2.tar.gz gcc-df397ce2bdc44b6a8cd3e100317c5390994bdde2.tar.bz2 | |
Inet4Address.java: Merged file header and javadocs.
2004-10-18 Michael Koch <konqueror@gmx.de>
* 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
Diffstat (limited to 'libjava/java/net/InetAddress.java')
| -rw-r--r-- | libjava/java/net/InetAddress.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 51bcf3a..06e1a24 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; } |