2004-11-16 Michael Koch <konqueror@gmx.de>

	* java/net/InetAddress.java
	(toString): Merged from GNU classpath.

From-SVN: r90743

libjava/ChangeLog

 2004-11-16  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/InetAddress.java
+	(toString): Merged from GNU classpath.
+
+2004-11-16  Michael Koch  <konqueror@gmx.de>
+
 	* java/awt/geom/doc-files/Area-1.png,
 	java/awt/geom/doc-files/Ellipse-1.png,
 	java/awt/geom/doc-files/GeneralPath-1.png:

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;
   }
 
   /**