[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: InetAddress fixlet

[Kaffe CVS]

PatchSet 5611 
Date: 2005/03/02 10:51:58
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: InetAddress fixlet
2005-03-02  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-25  Sven de Marothy  <sven at physto.se>

        * java/net/InetAddress.java
        (toString): Don't print empty hostnames.
        Fixes bug #11956

Members: 
	ChangeLog:1.3656->1.3657 
	libraries/javalib/java/net/InetAddress.java:1.28->1.29 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3656 kaffe/ChangeLog:1.3657
--- kaffe/ChangeLog:1.3656	Wed Mar  2 10:29:58 2005
+++ kaffe/ChangeLog	Wed Mar  2 10:51:58 2005
@@ -2,6 +2,16 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-25  Sven de Marothy  <sven at physto.se>
+
+        * java/net/InetAddress.java
+        (toString): Don't print empty hostnames.
+        Fixes bug #11956
+
+2005-03-02  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-24  Audrius Meskauskas  <audriusa at bluewin.ch>
 
         * javax/swing/Timer.java (constructor): assigning initialDelay
Index: kaffe/libraries/javalib/java/net/InetAddress.java
diff -u kaffe/libraries/javalib/java/net/InetAddress.java:1.28 kaffe/libraries/javalib/java/net/InetAddress.java:1.29
--- kaffe/libraries/javalib/java/net/InetAddress.java:1.28	Fri Jan  7 01:38:12 2005
+++ kaffe/libraries/javalib/java/net/InetAddress.java	Wed Mar  2 10:52:01 2005
@@ -1,5 +1,5 @@
 /* InetAddress.java -- Class to model an Internet address
-   Copyright (C) 1998, 1999, 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -554,7 +554,7 @@
   public String toString()
   {
     String addr = getHostAddress();
-    String host = (hostName != null) ? hostName : addr;
+    String host = (hostName != null) ? hostName : "";
     return host + "/" + addr;
   }