2003-11-04 Michael Koch <konqueror@gmx.de>

	* java/net/SocketPermission.java
	(equals): Removed unneeded obj == null check.
	* java/net/URL.java
	(equals): Removed unneeded obj == null check.
	(getURLStreamHandler): Removed unneeded ph == null check.

3 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a1df70e41..48609e482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-11-04  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/SocketPermission.java
+	(equals): Removed unneeded obj == null check.
+	* java/net/URL.java
+	(equals): Removed unneeded obj == null check.
+	(getURLStreamHandler): Removed unneeded ph == null check.
+
+2003-11-04  Michael Koch  <konqueror@gmx.de>
+
 	* java/util/zip/Checksum.java,
 	java/util/zip/ZipConstants.java:
 	Removed redundant modifiers.
diff --git a/java/net/SocketPermission.java b/java/net/SocketPermission.java
index dea04e243..350061738 100644
--- a/java/net/SocketPermission.java
+++ b/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/java/net/URL.java b/java/net/URL.java
index 1496a7da3..bc5d7a538 100644
--- a/java/net/URL.java
+++ b/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);
@@ -811,8 +811,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());
       }