diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2006-08-14 23:12:35 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-08-14 23:12:35 +0000 |
| commit | ac1ed908de999523efc36f38e69bca1aadfe0808 (patch) | |
| tree | 97037d2c09c8384d80531f67ec36a01205df6bdb /libjava/classpath/java/net/InetSocketAddress.java | |
| parent | abab460491408e05ea93fb85e1975296a87df504 (diff) | |
| download | gcc-ac1ed908de999523efc36f38e69bca1aadfe0808.tar.gz | |
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
Diffstat (limited to 'libjava/classpath/java/net/InetSocketAddress.java')
| -rw-r--r-- | libjava/classpath/java/net/InetSocketAddress.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libjava/classpath/java/net/InetSocketAddress.java b/libjava/classpath/java/net/InetSocketAddress.java index 91254575265..5267cc11a5d 100644 --- a/libjava/classpath/java/net/InetSocketAddress.java +++ b/libjava/classpath/java/net/InetSocketAddress.java @@ -86,7 +86,6 @@ public class InetSocketAddress extends SocketAddress this.addr = addr; this.port = port; - this.hostname = addr.getHostName(); } /** @@ -186,7 +185,7 @@ public class InetSocketAddress extends SocketAddress if (addr == null && sa.addr != null) return false; - else if (addr == null && sa.addr == null) + else if (addr == null && sa.addr == null) // we know hostname != null return hostname.equals(sa.hostname) && sa.port == port; else return addr.equals(sa.addr) && sa.port == port; @@ -213,6 +212,9 @@ public class InetSocketAddress extends SocketAddress */ public final String getHostName() { + if (hostname == null) // we know addr != null + hostname = addr.getHostName(); + return hostname; } @@ -249,10 +251,11 @@ public class InetSocketAddress extends SocketAddress /** * Returns the <code>InetSocketAddress</code> as string * - * @return A string represenation of this address. + * @return A string representation of this address. */ public String toString() { + // Note: if addr is null, then hostname != null. return (addr == null ? hostname : addr.toString()) + ":" + port; } } |