diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-12-07 01:19:02 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-12-07 01:19:02 +0000 |
| commit | 081a777dead77dd4f409ecfd6172a4b475af7579 (patch) | |
| tree | feed5dd7eaff2b4b7085c477c6603c7f6221344e /libjava/java/net/InetAddress.java | |
| parent | 708991482862082db6be96f523b6a76780cc8214 (diff) | |
| download | gcc-081a777dead77dd4f409ecfd6172a4b475af7579.zip gcc-081a777dead77dd4f409ecfd6172a4b475af7579.tar.gz gcc-081a777dead77dd4f409ecfd6172a4b475af7579.tar.bz2 | |
InetAddress.java (toString): Use hostname when not null, don't do an explicit reverse getHostName() lookup.
* java/net/InetAddress.java (toString): Use hostname when not null,
don't do an explicit reverse getHostName() lookup.
* java/net/Socket.java (setSocketImplFactory): When fac == null throw
NullPointerException.
From-SVN: r59902
Diffstat (limited to 'libjava/java/net/InetAddress.java')
| -rw-r--r-- | libjava/java/net/InetAddress.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index c15c0f6..4a32352 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -1,6 +1,6 @@ // INetAddress.java -- An Internet Protocol (IP) address. -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation This file is part of libgcj. @@ -413,12 +413,13 @@ public class InetAddress implements Serializable */ public String toString() { - String hostname = getHostName (); - - if (hostname == "") - hostname = getHostAddress (); - - return hostname + '/' + getHostAddress (); + String result; + String address = getHostAddress(); + if (hostName != null) + result = hostName + "/" + address; + else + result = address; + return result; } /** |