From 9c9081ae918ff0873d692348b88b00d83ab0f509 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 29 Oct 2003 10:53:19 +0000 Subject: 2003-10-29 Michael Koch * 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 --- libjava/java/net/URL.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libjava/java/net/URL.java') diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java index dd1ea4f0855..0fd22b1cb99 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()); } -- cgit v1.2.3