diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-10-29 10:53:19 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-10-29 10:53:19 +0000 |
| commit | 9c9081ae918ff0873d692348b88b00d83ab0f509 (patch) | |
| tree | 9c7974ee54d4436db236b7ad7c629dc4fd09791a /libjava/java | |
| parent | 1d749ee003f6ee1b0a531c64e8929be20d2adf24 (diff) | |
| download | gcc-9c9081ae918ff0873d692348b88b00d83ab0f509.zip gcc-9c9081ae918ff0873d692348b88b00d83ab0f509.tar.gz gcc-9c9081ae918ff0873d692348b88b00d83ab0f509.tar.bz2 | |
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
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/net/InetAddress.java | 3 | ||||
| -rw-r--r-- | libjava/java/net/SocketPermission.java | 3 | ||||
| -rw-r--r-- | libjava/java/net/URL.java | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 6d72d62..8d09827 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 dea04e2..3500617 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 dd1ea4f..0fd22b1 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()); } |