aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-11-16 15:33:49 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-11-16 15:33:49 +0000
commit0a56af0b241f9f72b70e1a76c6c101f3ed398739 (patch)
tree4b3ea486a0ff551508c84c39236ab168b30a93cd /libjava/java
parentc1d36a8934aa64f8be424b0099c53bdf62e712bd (diff)
downloadgcc-0a56af0b241f9f72b70e1a76c6c101f3ed398739.zip
gcc-0a56af0b241f9f72b70e1a76c6c101f3ed398739.tar.gz
gcc-0a56af0b241f9f72b70e1a76c6c101f3ed398739.tar.bz2
2004-11-16 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java (toString): Merged from GNU classpath. From-SVN: r90743
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/net/InetAddress.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 06e1a24..24743cc 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -488,9 +488,9 @@ public class InetAddress implements Serializable
*/
public String toString()
{
- String address = getHostAddress();
- String host = (hostName != null) ? hostName : address;
- return host + "/" + address;
+ String addr = getHostAddress();
+ String host = (hostName != null) ? hostName : addr;
+ return host + "/" + addr;
}
/**