2006-10-05 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics for 2006/09/03-2006/10/04.

1 files changed, 7 insertions, 2 deletions

diff --git a/java/net/Inet6Address.java b/java/net/Inet6Address.java
index 8d834a6fd..ef3c4431a 100644
--- a/java/net/Inet6Address.java
+++ b/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 AF_INET6 = 10;
+
+  /**
    * 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, AF_INET6);
     // Super constructor clones the addr.  Get a reference to the clone.
     this.ipaddress = this.addr;
     ifname = null;