summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2003-01-16 21:11:30 +0000
committerMark Wielaard <mark@klomp.org>2003-01-16 21:11:30 +0000
commit37df2e1a65a451c1a41e3dc41d6b00d4dfae53c2 (patch)
tree9bdb6373955369e0682fabab1abbc541d1fc76eb
parent659e7e5bf3cf94497ac8f007f84cf4d5e7309ef1 (diff)
downloadclasspath-37df2e1a65a451c1a41e3dc41d6b00d4dfae53c2.tar.gz
* java/net/SocketImpl.java (toString): Don't explicitly call
toString() on possible null address.
-rw-r--r--ChangeLog5
-rw-r--r--java/net/SocketImpl.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 648a2a393..591003c9f 100644
--- a/ChangeLog
+++ b/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-14 Michael Koch <konqueror@gmx.de>
* java/net/MulticastSocket.java
diff --git a/java/net/SocketImpl.java b/java/net/SocketImpl.java
index 795e7139b..f0f1a3c87 100644
--- a/java/net/SocketImpl.java
+++ b/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 + "]";
}
/**