2003-10-29 Michael Koch <konqueror@gmx.de>

	* java/net/InetAddress.java
	(equals): Remove redundant obj == null check.
	* java/net/SocketPermission.java
	(equals): Likewise.
	* java/net/URL.java
	(equals): Likewise.
	(getURLStreamHandler): Likewise.

From-SVN: r73034

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8a846f6a04ac344c1d73b43afeb7967153b1ecb3..07043ac856e9f5af34b6e740a3cd8eb7df77a9e9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-29  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/InetAddress.java
+       (equals): Remove redundant obj == null check.
+       * java/net/SocketPermission.java
+       (equals): Likewise.
+       * java/net/URL.java
+       (equals): Likewise.
+       (getURLStreamHandler): Likewise.
+
 2003-10-29  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/net/natPlainDatagramSocketImplPosix.cc

diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 6d72d627c64353839efaf05f3690e0d260152858..8d09827655d10a6f78dc8598691e3ee93e3a592b 100644 (file)
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -476,8 +476,7 @@ public class InetAddress implements Serializable
    */
   public boolean equals (Object obj)
   {
-    if (obj == null
-        || ! (obj instanceof InetAddress))
+    if (! (obj instanceof InetAddress))
       return false;
     
     // "The Java Class Libraries" 2nd edition says "If a machine has

diff --git a/libjava/java/net/SocketPermission.java b/libjava/java/net/SocketPermission.java
index dea04e2432aae6147c5e8ba5d29c90b076d40add..35006173828ba13e2e16fba3cb6321e7f1810649 100644 (file)
--- a/libjava/java/net/SocketPermission.java
+++ b/libjava/java/net/SocketPermission.java
@@ -147,9 +147,6 @@ public final class SocketPermission extends Permission
    */
   public boolean equals(Object obj)
   {
-    if (obj == null)
-      return (false);
-
     if (!(obj instanceof SocketPermission))
       return (false);
 

diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index dd1ea4f0855d47f3c531f8cfa03421419e1aa1df..0fd22b1cb99ec759d14c1b57b394cb54859dd928 100644 (file)
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -451,7 +451,7 @@ public final class URL implements Serializable
    */
   public boolean equals (Object obj)
   {
-    if (obj == null || ! (obj instanceof URL))
+    if (! (obj instanceof URL))
       return false;
 
     return ph.equals (this, (URL) obj);
@@ -829,8 +829,7 @@ public final class URL implements Serializable
                 // Can't instantiate; handler still null, go on to next element.
               }
           }
-       while ((ph == null ||
-               !(ph instanceof URLStreamHandler))
+       while ((! (ph instanceof URLStreamHandler))
                && pkgPrefix.hasMoreTokens());
       }