From 5237cd77c28ff1bcfddc6ef7029038bd747bea4c Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 11 Nov 2003 12:22:20 +0000 Subject: [PATCH] Font.java, [...]: Removed some redundant obj == null checks. 2003-11-11 Michael Koch * java/awt/Font.java, java/awt/datatransfer/DataFlavor.java, java/math/BigInteger.java, java/net/Inet4Address.java, java/net/Inet6Address.java, java/rmi/MarshalledObject.java, java/rmi/server/RMIClassLoader.java, java/security/cert/CertStore.java, java/sql/Timestamp.java, java/text/SimpleDateFormat.java, javax/naming/CompoundName.java: Removed some redundant obj == null checks. From-SVN: r73448 --- libjava/ChangeLog | 15 +++++++++++++++ libjava/java/awt/Font.java | 3 --- libjava/java/awt/datatransfer/DataFlavor.java | 3 --- libjava/java/math/BigInteger.java | 2 +- libjava/java/net/Inet4Address.java | 2 +- libjava/java/net/Inet6Address.java | 2 +- libjava/java/rmi/MarshalledObject.java | 2 +- libjava/java/rmi/server/RMIClassLoader.java | 3 +-- libjava/java/security/cert/CertStore.java | 3 +-- libjava/java/sql/Timestamp.java | 3 --- libjava/java/text/SimpleDateFormat.java | 3 --- libjava/javax/naming/CompoundName.java | 2 +- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 607d1f8ef69..1d26a6f0398 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2003-11-11 Michael Koch + + * java/awt/Font.java, + java/awt/datatransfer/DataFlavor.java, + java/math/BigInteger.java, + java/net/Inet4Address.java, + java/net/Inet6Address.java, + java/rmi/MarshalledObject.java, + java/rmi/server/RMIClassLoader.java, + java/security/cert/CertStore.java, + java/sql/Timestamp.java, + java/text/SimpleDateFormat.java, + javax/naming/CompoundName.java: + Removed some redundant obj == null checks. + 2003-11-11 Michael Koch * java/nio/ByteBuffer.java diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index d1ff566e559..809684311f0 100644 --- a/libjava/java/awt/Font.java +++ b/libjava/java/awt/Font.java @@ -1226,9 +1226,6 @@ hashCode() public boolean equals(Object obj) { - if (obj == null) - return(false); - if (!(obj instanceof Font)) return(false); diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java index e56f9759a50..897edff4c0f 100644 --- a/libjava/java/awt/datatransfer/DataFlavor.java +++ b/libjava/java/awt/datatransfer/DataFlavor.java @@ -723,9 +723,6 @@ equals(DataFlavor flavor) public boolean equals(Object obj) { - if (obj == null) - return(false); - if (!(obj instanceof DataFlavor)) return(false); diff --git a/libjava/java/math/BigInteger.java b/libjava/java/math/BigInteger.java index fb1cf7c59bd..312a9e91a8e 100644 --- a/libjava/java/math/BigInteger.java +++ b/libjava/java/math/BigInteger.java @@ -1565,7 +1565,7 @@ public class BigInteger extends Number implements Comparable /* Assumes this and obj are both canonicalized. */ public boolean equals(Object obj) { - if (obj == null || ! (obj instanceof BigInteger)) + if (! (obj instanceof BigInteger)) return false; return equals(this, (BigInteger) obj); } diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java index 3b18f6fdd10..76abfc3fce4 100644 --- a/libjava/java/net/Inet4Address.java +++ b/libjava/java/net/Inet4Address.java @@ -258,7 +258,7 @@ public final class Inet4Address extends InetAddress */ public boolean equals (Object obj) { - if (obj == null || ! (obj instanceof InetAddress)) + if (! (obj instanceof InetAddress)) return false; byte[] addr1 = addr; diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java index 4f4563ddcc5..c3418c654a9 100644 --- a/libjava/java/net/Inet6Address.java +++ b/libjava/java/net/Inet6Address.java @@ -243,7 +243,7 @@ public final class Inet6Address extends InetAddress */ public boolean equals (Object obj) { - if (obj == null || ! (obj instanceof Inet6Address)) + if (! (obj instanceof Inet6Address)) return false; Inet6Address tmp = (Inet6Address) obj; diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java index 9f966b9d9dc..0ba91580d1a 100644 --- a/libjava/java/rmi/MarshalledObject.java +++ b/libjava/java/rmi/MarshalledObject.java @@ -76,7 +76,7 @@ public final class MarshalledObject public boolean equals(Object obj) { - if(obj == null || !(obj instanceof MarshalledObject) ) + if (! (obj instanceof MarshalledObject)) return false; // hashCode even differs, don't do the time-consuming comparisons diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java index 57e52a363ba..e6af682a452 100644 --- a/libjava/java/rmi/server/RMIClassLoader.java +++ b/libjava/java/rmi/server/RMIClassLoader.java @@ -113,8 +113,7 @@ public class RMIClassLoader */ public boolean equals (Object theOther) { - if (theOther != null - && theOther instanceof CacheKey) + if (theOther instanceof CacheKey) { CacheKey key = (CacheKey) theOther; diff --git a/libjava/java/security/cert/CertStore.java b/libjava/java/security/cert/CertStore.java index 44143c5ad6c..55326a4b2c9 100644 --- a/libjava/java/security/cert/CertStore.java +++ b/libjava/java/security/cert/CertStore.java @@ -215,8 +215,7 @@ public class CertStore catch (java.lang.reflect.InvocationTargetException ite) { Throwable cause = ite.getCause(); - if (cause != null && - (cause instanceof InvalidAlgorithmParameterException)) + if (cause instanceof InvalidAlgorithmParameterException) throw (InvalidAlgorithmParameterException) cause; else throw new NoSuchAlgorithmException(type); diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java index 5ec75da61c1..22108f58f93 100644 --- a/libjava/java/sql/Timestamp.java +++ b/libjava/java/sql/Timestamp.java @@ -224,9 +224,6 @@ public class Timestamp extends java.util.Date */ public boolean equals(Object obj) { - if (obj == null) - return false; - if (!(obj instanceof Timestamp)) return false; diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index 3ad71ee89ed..88aaf41f9bd 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -374,9 +374,6 @@ public class SimpleDateFormat extends DateFormat */ public boolean equals(Object o) { - if (o == null) - return false; - if (!super.equals(o)) return false; diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java index 20396398d10..4df89e9af95 100644 --- a/libjava/javax/naming/CompoundName.java +++ b/libjava/javax/naming/CompoundName.java @@ -240,7 +240,7 @@ public class CompoundName implements Name, Cloneable, Serializable public int compareTo (Object obj) { - if (obj == null || ! (obj instanceof CompoundName)) + if (! (obj instanceof CompoundName)) throw new ClassCastException ("CompoundName.compareTo() expected CompoundName"); CompoundName cn = (CompoundName) obj; int last = Math.min (cn.elts.size (), elts.size ()); -- 2.30.2