summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-16 21:37:56 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-16 21:37:56 +0000
commit545ef1c5e6b3eb88fb5b809f66d38a0396886b41 (patch)
tree5e2e861791f278b8a6988c36ba96a18c1732b21a /libjava
parent954ad4204e85494b2ed5dbb3d29e017f21a73334 (diff)
downloadgcc-545ef1c5e6b3eb88fb5b809f66d38a0396886b41.tar.gz
* java/net/SocketImpl.java (toString): Don't explicitly call
toString() on possible null address. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61404 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/net/SocketImpl.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf5028f3c65..45a00fda736 100644
--- 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 795e7139bee..f0f1a3c87bc 100644
--- 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 + "]";
}
/**