diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-29 10:53:19 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-29 10:53:19 +0000 |
| commit | c2eb2dd56d0824e8b93697a3f6830355d9e264e6 (patch) | |
| tree | 9c7974ee54d4436db236b7ad7c629dc4fd09791a /libjava | |
| parent | 9fb142626eec6e9af41d9d3a18b216fc835a15f6 (diff) | |
| download | ppe42-gcc-c2eb2dd56d0824e8b93697a3f6830355d9e264e6.tar.gz ppe42-gcc-c2eb2dd56d0824e8b93697a3f6830355d9e264e6.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73034 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -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 |
4 files changed, 13 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8a846f6a04a..07043ac856e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 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 (setOption): Directly return if no error occured. * gnu/java/net/natPlainSocketImplPosix.cc diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 6d72d627c64..8d09827655d 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 dea04e2432a..35006173828 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 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()); } |
