[cp-patches] FYI: InetAddress family handling (take 3)

[Gary Benson]

Hi again,

So it turns out that my last commit was unnecessary -- the header
causing the problems should never have been included anyway -- so
since I preferred the original version with AF_INET and AF_INET6
I have reverted to it.

Cheers,
Gary

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.8523
diff -u -r1.8523 ChangeLog
--- ChangeLog   11 Sep 2006 10:45:02 -0000      1.8523
+++ ChangeLog   11 Sep 2006 11:43:47 -0000
@@ -1,3 +1,12 @@
+2006-09-11  Gary Benson  <[EMAIL PROTECTED]>
+
+       * java/net/Inet4Address.java
+       (FAMILY): Renamed back to AF_INET.
+       (<init>, writeReplace): Reflect the above.
+       * java/net/Inet6Address.java
+       (FAMILY): Renamed back to AF_INET6.
+       (<init>): Reflect the above.
+
 2006-09-11  Cameron McCormack  <[EMAIL PROTECTED]>
 
        Fixes PR29010
Index: java/net/Inet4Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet4Address.java,v
retrieving revision 1.22
diff -u -r1.22 Inet4Address.java
--- java/net/Inet4Address.java  11 Sep 2006 10:39:33 -0000      1.22
+++ java/net/Inet4Address.java  11 Sep 2006 11:43:47 -0000
@@ -57,16 +57,16 @@
   static final long serialVersionUID = 3286316764910316507L;
 
   /**
-   * The address family of these addresses.  Used for serialization.
+   * 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 @@
    */
   Inet4Address(byte[] addr, String host)
   {
-    super(addr, host, FAMILY);
+    super(addr, host, AF_INET);
   }
 
   /**
Index: java/net/Inet6Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet6Address.java,v
retrieving revision 1.15
diff -u -r1.15 Inet6Address.java
--- java/net/Inet6Address.java  11 Sep 2006 10:39:33 -0000      1.15
+++ java/net/Inet6Address.java  11 Sep 2006 11:43:47 -0000
@@ -93,9 +93,9 @@
   private transient NetworkInterface nif; 
 
   /**
-   * The address family of these addresses.  Used for serialization.
+   * 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 @@
    */
   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;