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

Inet4Address.java: Merged file header and javadocs. 

2004-10-18  Michael Koch  <konqueror@gmx.de>

	* java/net/Inet4Address.java: Merged file header and javadocs.
	* java/net/Inet6Address.java: Likewise.
	* java/net/InetAddress.java
	(getCanonicalHostName): Create Inet4Address object instead of
	InetAddress and add comment regarding IPv6.
	(toString): Simplified.

From-SVN: r89211
This commit is contained in:
Michael Koch 2004-10-18 12:36:27 +00:00 committed by Michael Koch
parent 2c661756f4
commit df397ce2bd
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
2004-10-18 Michael Koch <konqueror@gmx.de>
* java/net/Inet4Address.java: Merged file header and javadocs.
* java/net/Inet6Address.java: Likewise.
* java/net/InetAddress.java
(getCanonicalHostName): Create Inet4Address object instead of
InetAddress and add comment regarding IPv6.
(toString): Simplified.
2004-10-18 Michael Koch <konqueror@gmx.de>
* gnu/java/net/protocol/http/Connection.java,

25
libjava/java/net/Inet4Address.java
View File

@ -1,5 +1,5 @@
/* Inet4Address.java
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Inet4Address.java --
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -35,23 +35,20 @@ this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package java.net;
import java.io.ObjectStreamException;
import java.util.Arrays;
/**
* @author Michael Koch
* @date August 3, 2002.
*/
/*
* Written using on-line Java Platform 1.4 API Specification and
* RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt),
* RFC 1918 (http://www.ietf.org/rfc/rfc1918.txt),
* RFC 2365 (http://www.ietf.org/rfc/rfc2365.txt)
* Status: Believed complete and correct.
*
* @author Michael Koch
* @status Believed complete and correct.
*/
public final class Inet4Address extends InetAddress
{
@ -67,12 +64,14 @@ public final class Inet4Address extends InetAddress
{
return new InetAddress(addr, hostName);
}
/**
* Creates a Inet4Address
* Initializes this object's addr instance variable from the passed in
* byte array. Note that this constructor is protected and is called
* only by static methods in this class.
*
* @param addr The IP address
* @param host The Hostname
* @param addr The IP number of this address as an array of bytes
* @param hostname The hostname of this IP address.
*/
Inet4Address(byte[] addr, String host)
{

15
libjava/java/net/Inet6Address.java
View File

@ -1,5 +1,5 @@
/* Inet6Address.java
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Inet6Address.java --
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -35,20 +35,17 @@ this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package java.net;
import java.util.Arrays;
/**
* @author Michael Koch
* @date August 3, 2002.
*/
/*
* Written using on-line Java Platform 1.4 API Specification and
* RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt)
* Status: Believed complete and correct.
*
* @author Michael Koch
* @status Believed complete and correct.
*/
public final class Inet6Address extends InetAddress
{

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

@ -313,7 +313,7 @@ public class InetAddress implements Serializable
{
try
{
sm.checkConnect (hostName, -1);
sm.checkConnect(hostName, -1);
}
catch (SecurityException e)
{
@ -322,7 +322,8 @@ public class InetAddress implements Serializable
}
// Try to find the FDQN now
InetAddress address = new InetAddress (getAddress(), null);
// FIXME: This does not work with IPv6.
InetAddress address = new Inet4Address(getAddress(), null);
return address.getHostName();
}
@ -487,14 +488,8 @@ public class InetAddress implements Serializable
*/
public String toString()
{
String host;
String address = getHostAddress();
if (hostName != null)
host = hostName;
else
host = address;
String host = (hostName != null) ? hostName : address;
return host + "/" + address;
}