diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-09-20 07:53:18 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2006-09-20 07:53:18 +0000 |
| commit | 884d9d372eb7518d50b6bd77d1420909a0e701cf (patch) | |
| tree | d481eaee86d8ea88a0c28ad7474bd0df6ae1e401 /libjava/classpath/java/net/Inet6Address.java | |
| parent | 7c324b07c6ec8af614b6763c32b94c5c860a413b (diff) | |
InetAddress.java: Updated to latest.
2006-09-20 Gary Benson <gbenson@redhat.com>
* 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.
(<init>, writeReplace): Reflect the above.
* classpath/java/net/Inet6Address.java
(AF_INET6): Renamed to FAMILY.
(<init>): Reflect the above.
From-SVN: r117074
Diffstat (limited to 'libjava/classpath/java/net/Inet6Address.java')
| -rw-r--r-- | libjava/classpath/java/net/Inet6Address.java | 9 |
1 files changed, 7 insertions, 2 deletions
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. @@ -93,6 +93,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 * * @param addr The IP address @@ -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; |