From 081a777dead77dd4f409ecfd6172a4b475af7579 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 7 Dec 2002 01:19:02 +0000 Subject: 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 --- libjava/java/net/InetAddress.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libjava/java/net/InetAddress.java') diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index c15c0f6dc41..4a32352b481 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; } /** -- cgit v1.2.3