From f67883c360bbe52e21a6fe3582edd07388246bcf Mon Sep 17 00:00:00 2001 From: mkoch Date: Tue, 11 Nov 2003 12:22:20 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73448 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/rmi/MarshalledObject.java | 2 +- libjava/java/rmi/server/RMIClassLoader.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libjava/java/rmi') 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; -- cgit v1.2.3