--- java/org/apache/catalina/core/ApplicationTaglibDescriptor.java (revision 1051262) +++ java/org/apache/catalina/core/ApplicationTaglibDescriptor.java (working copy) @@ -54,9 +54,6 @@ if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof ApplicationTaglibDescriptor)) { return false; } --- java/org/apache/catalina/deploy/LoginConfig.java (revision 1051262) +++ java/org/apache/catalina/deploy/LoginConfig.java (working copy) @@ -195,8 +195,6 @@ public boolean equals(Object obj) { if (this == obj) return true; - if (obj == null) - return false; if (!(obj instanceof LoginConfig)) return false; LoginConfig other = (LoginConfig) obj; --- java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (revision 1051262) +++ java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (working copy) @@ -353,7 +353,6 @@ @Override public boolean equals(Object o) { - if ( o == null ) return false; if ( !(o instanceof AbstractReplicatedMap)) return false; if ( !(o.getClass().equals(this.getClass())) ) return false; AbstractReplicatedMap other = (AbstractReplicatedMap)o; --- java/org/apache/el/parser/SimpleNode.java (revision 1051262) +++ java/org/apache/el/parser/SimpleNode.java (working copy) @@ -180,9 +180,6 @@ if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof SimpleNode)) { return false; } --- java/org/apache/naming/NamingEntry.java (revision 1051262) +++ java/org/apache/naming/NamingEntry.java (working copy) @@ -66,7 +66,7 @@ @Override public boolean equals(Object obj) { - if ((obj != null) && (obj instanceof NamingEntry)) { + if (obj instanceof NamingEntry) { return name.equals(((NamingEntry) obj).name); } else { return false; --- java/org/apache/tomcat/util/net/URL.java (revision 1051262) +++ java/org/apache/tomcat/util/net/URL.java (working copy) @@ -304,8 +304,6 @@ @Override public boolean equals(Object obj) { - if (obj == null) - return (false); if (!(obj instanceof URL)) return (false); URL other = (URL) obj;