OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-11-16 Michael Koch <konqueror@gmx.de>

Browse Source 
* java/net/InetAddress.java
	(toString): Merged from GNU classpath.

From-SVN: r90743
This commit is contained in:
Michael Koch 2004-11-16 15:33:49 +00:00 committed by Michael Koch
parent c1d36a8934
commit 0a56af0b24
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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,

6
libjava/java/net/InetAddress.java
View File

@ -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;
}
/**