From: Michael Koch <konqueror@gmx.de>
Date: Wed, 29 Oct 2003 10:53:19 +0000 (+0000)
Subject: 2003-10-29  Michael Koch  <konqueror@gmx.de>
X-Git-Tag: releases/gcc-3.4.0~2652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c9081ae918ff0873d692348b88b00d83ab0f509;p=thirdparty%2Fgcc.git

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 8a846f6a04ac..07043ac856e9 100644
--- 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 6d72d627c643..8d09827655d1 100644
--- 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 dea04e2432aa..35006173828b 100644
--- 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 dd1ea4f0855d..0fd22b1cb99e 100644
--- 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());
       }