Inet6Address.java (isAnyLocalAddress): Don't use "==" on arrays.

	* java/net/Inet6Address.java (isAnyLocalAddress): Don't use "=="
	on arrays.
	(isLoopbackAddress): Likewise.
	* java/net/Inet4Address.java (isAnyLocalAddress): Don't use "=="
	on arrays.

From-SVN: r68173

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 391a0235b21dd2bd9f613effd72c27bb1c6e9478..fc1b286d47323150a749c6b45bec26193ca4c726 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-18  Tom Tromey  <tromey@redhat.com>
+
+       * java/net/Inet6Address.java (isAnyLocalAddress): Don't use "=="
+       on arrays.
+       (isLoopbackAddress): Likewise.
+       * java/net/Inet4Address.java (isAnyLocalAddress): Don't use "=="
+       on arrays.
+
 2003-06-18  Matt Kraai  <kraai@alumni.cmu.edu>
 
        * java/lang/natVMSecurityManager.cc (getClassContext):

diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java
index c635c671d0eb563d8ef65879081b1f0834611530..d2892fe57e0943fb4102c9e85eccde12417f2c4c 100644 (file)
--- a/libjava/java/net/Inet4Address.java
+++ b/libjava/java/net/Inet4Address.java
@@ -1,5 +1,5 @@
 /* Inet4Address.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ package java.net;
 
 import java.io.IOException;
 import java.io.ObjectStreamException;
+import java.util.Arrays;
 
 /**
  * @author Michael Koch
@@ -103,7 +104,7 @@ public final class Inet4Address extends InetAddress
   {
     byte[] anylocal = { 0, 0, 0, 0 };
     
-    return addr == anylocal;
+    return Arrays.equals(addr, anylocal);
   }
 
   /**

diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java
index 8d3c0c3af4465172dc5217211a2e505781797c84..ee6e666e029ef530509622350f5125de0dd551be 100644 (file)
--- a/libjava/java/net/Inet6Address.java
+++ b/libjava/java/net/Inet6Address.java
@@ -1,5 +1,5 @@
 /* Inet6Address.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,7 @@ exception statement from your version. */
 package java.net;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * @author Michael Koch
@@ -91,7 +92,7 @@ public final class Inet6Address extends InetAddress
     byte[] anylocal = { 0, 0, 0, 0, 0, 0, 0, 0,
                        0, 0, 0, 0, 0, 0, 0, 0 };
     
-    return ipaddress == anylocal;
+    return Arrays.equals(ipaddress, anylocal);
   }
          
   /**
@@ -104,7 +105,7 @@ public final class Inet6Address extends InetAddress
     byte[] loopback = { 0, 0, 0, 0, 0, 0, 0, 0,
                        0, 0, 0, 0, 0, 0, 0, 1 };
     
-    return ipaddress == loopback;
+    return Arrays.equals(ipaddress, loopback);
   }
 
   /**