From 0a56af0b241f9f72b70e1a76c6c101f3ed398739 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 16 Nov 2004 15:33:49 +0000 Subject: [PATCH] 2004-11-16 Michael Koch * java/net/InetAddress.java (toString): Merged from GNU classpath. From-SVN: r90743 --- libjava/ChangeLog | 5 +++++ libjava/java/net/InetAddress.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8effe520da6..7a6759d723a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-11-16 Michael Koch + + * java/net/InetAddress.java + (toString): Merged from GNU classpath. + 2004-11-16 Michael Koch * java/awt/geom/doc-files/Area-1.png, diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 06e1a240abd..24743cc1acc 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -488,9 +488,9 @@ public class InetAddress implements Serializable */ public String toString() { - String address = getHostAddress(); - String host = (hostName != null) ? hostName : address; - return host + "/" + address; + String addr = getHostAddress(); + String host = (hostName != null) ? hostName : addr; + return host + "/" + addr; } /**