diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-16 15:33:49 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-16 15:33:49 +0000 |
| commit | 766ffa5835f0b24ef239e54908dbcce2a137e47a (patch) | |
| tree | 4b3ea486a0ff551508c84c39236ab168b30a93cd | |
| parent | 168e641ef92934f117401b0f21fd7219ff26bbac (diff) | |
| download | ppe42-gcc-766ffa5835f0b24ef239e54908dbcce2a137e47a.tar.gz ppe42-gcc-766ffa5835f0b24ef239e54908dbcce2a137e47a.zip | |
2004-11-16 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java
(toString): Merged from GNU classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90743 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/InetAddress.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8effe520da6..7a6759d723a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-11-16 Michael Koch <konqueror@gmx.de> + * java/net/InetAddress.java + (toString): Merged from GNU classpath. + +2004-11-16 Michael Koch <konqueror@gmx.de> + * java/awt/geom/doc-files/Area-1.png, java/awt/geom/doc-files/Ellipse-1.png, java/awt/geom/doc-files/GeneralPath-1.png: diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 06e1a240abd..24743cc1acc 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; } /** |
