SocketImpl.java (toString): Don't explicitly call toString() on possible null address.

       * java/net/SocketImpl.java (toString): Don't explicitly call
       toString() on possible null address.

From-SVN: r61404

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf5028f3c65fb3d48e5e75942370e816675aa0da..45a00fda73680233e3505664312e39b54ec5d30d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-16  Mark Wielaard  <mark@klomp.org>
+
+       * java/net/SocketImpl.java (toString): Don't explicitly call
+       toString() on possible null address.
+
 2003-01-16  Michael Koch  <konqueror@gmx.de>
 
        * java/net/MulticastSocket.java

diff --git a/libjava/java/net/SocketImpl.java b/libjava/java/net/SocketImpl.java
index 795e7139beeed0481bb9caca907a58d810251e91..f0f1a3c87bc0d0ba421ba5870e66419f23d7a15e 100644 (file)
--- a/libjava/java/net/SocketImpl.java
+++ b/libjava/java/net/SocketImpl.java
@@ -271,8 +271,9 @@ public abstract class SocketImpl implements SocketOptions
    */
   public String toString()
   {
-    return "[addr=" + address.toString() + ",port=" + Integer.toString(port)
-      + ",localport=" + Integer.toString(localport) + "]";
+    return "[addr=" + address
+           + ",port=" + port
+           + ",localport=" + localport + "]";
   }
 
   /**