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

2006-11-03 Gary Benson <gbenson@redhat.com> 

* java/net/Inet4Address.java
	(FAMILY): Renamed to AF_INET.
	(<init>, writeReplace): Reflect the above.
	* java/net/Inet6Address.java
	(FAMILY): Renamed to AF_INET6.
	(<init>): Reflect the above.

From-SVN: r118452
This commit is contained in:
Gary Benson 2006-11-03 10:16:30 +00:00 committed by Gary Benson
parent adefdaca2d
commit 54f9963a20
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/classpath/ChangeLog.gcj
View File

@ -1,3 +1,12 @@
2006-11-03 Gary Benson <gbenson@redhat.com>
* java/net/Inet4Address.java
(FAMILY): Renamed to AF_INET.
(<init>, writeReplace): Reflect the above.
* java/net/Inet6Address.java
(FAMILY): Renamed to AF_INET6.
(<init>): Reflect the above.
2006-10-10 Tom Tromey <tromey@redhat.com>
PR classpath/29362:

6
libjava/classpath/java/net/Inet4Address.java
View File

@ -59,14 +59,14 @@ public final class Inet4Address extends InetAddress
/**
* The address family of these addresses (used for serialization).
*/
private static final int FAMILY = 2; // AF_INET
private static final int AF_INET = 2;
/**
* Inet4Address objects are serialized as InetAddress objects.
*/
private Object writeReplace() throws ObjectStreamException
{
return new InetAddress(addr, hostName, FAMILY);
return new InetAddress(addr, hostName, AF_INET);
}
/**
@ -79,7 +79,7 @@ public final class Inet4Address extends InetAddress
*/
Inet4Address(byte[] addr, String host)
{
super(addr, host, FAMILY);
super(addr, host, AF_INET);
}
/**

4
libjava/classpath/java/net/Inet6Address.java
View File

@ -95,7 +95,7 @@ public final class Inet6Address extends InetAddress
/**
* The address family of these addresses (used for serialization).
*/
private static final int FAMILY = 10; // AF_INET6
private static final int AF_INET6 = 10;
/**
* Create an Inet6Address object
@ -105,7 +105,7 @@ public final class Inet6Address extends InetAddress
*/
Inet6Address(byte[] addr, String host)
{
super(addr, host, FAMILY);
super(addr, host, AF_INET6);
// Super constructor clones the addr. Get a reference to the clone.
this.ipaddress = this.addr;
ifname = null;