From 884d9d372eb7518d50b6bd77d1420909a0e701cf Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 20 Sep 2006 07:53:18 +0000 Subject: InetAddress.java: Updated to latest. 2006-09-20 Gary Benson * classpath/java/net/InetAddress.java: Updated to latest. * classpath/java/net/Inet4Address.java: Likewise. * classpath/java/net/Inet6Address.java: Likewise. * classpath/java/net/ResolverCache.java: Likewise. * classpath/java/net/SocketPermission.java: Likewise. * classpath/java/net/Inet4Address.java (AF_INET): Renamed to FAMILY. (, writeReplace): Reflect the above. * classpath/java/net/Inet6Address.java (AF_INET6): Renamed to FAMILY. (): Reflect the above. From-SVN: r117074 --- libjava/classpath/java/net/Inet6Address.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libjava/classpath/java/net/Inet6Address.java') diff --git a/libjava/classpath/java/net/Inet6Address.java b/libjava/classpath/java/net/Inet6Address.java index 8d834a6fd28..2015fe1eb96 100644 --- a/libjava/classpath/java/net/Inet6Address.java +++ b/libjava/classpath/java/net/Inet6Address.java @@ -1,5 +1,5 @@ /* Inet6Address.java -- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -92,6 +92,11 @@ public final class Inet6Address extends InetAddress */ private transient NetworkInterface nif; + /** + * The address family of these addresses (used for serialization). + */ + private static final int FAMILY = 10; // AF_INET6 + /** * Create an Inet6Address object * @@ -100,7 +105,7 @@ public final class Inet6Address extends InetAddress */ Inet6Address(byte[] addr, String host) { - super(addr, host); + super(addr, host, FAMILY); // Super constructor clones the addr. Get a reference to the clone. this.ipaddress = this.addr; ifname = null; -- cgit v1.2.3