Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50601

Code clean-up
Patch provided by sebb

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1060907 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java b/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
index a7a6a79..bc5f681 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
+++ b/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
@@ -54,9 +54,6 @@ public class ApplicationTaglibDescriptor implements TaglibDescriptor {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
         if (!(obj instanceof ApplicationTaglibDescriptor)) {
             return false;
         }

diff --git a/java/org/apache/catalina/deploy/LoginConfig.java b/java/org/apache/catalina/deploy/LoginConfig.java
index 76bcc81..35400df 100644 (file)
--- a/java/org/apache/catalina/deploy/LoginConfig.java
+++ b/java/org/apache/catalina/deploy/LoginConfig.java
@@ -195,8 +195,6 @@ public class LoginConfig implements Serializable {
     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;

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index e36920f..28160c5 100644 (file)
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -353,7 +353,6 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
     
     @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;

diff --git a/java/org/apache/el/parser/SimpleNode.java b/java/org/apache/el/parser/SimpleNode.java
index 6010381..8e5f237 100644 (file)
--- a/java/org/apache/el/parser/SimpleNode.java
+++ b/java/org/apache/el/parser/SimpleNode.java
@@ -180,9 +180,6 @@ public abstract class SimpleNode extends ELSupport implements Node {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
         if (!(obj instanceof SimpleNode)) {
             return false;
         }

diff --git a/java/org/apache/naming/NamingEntry.java b/java/org/apache/naming/NamingEntry.java
index 82b630d..5916904 100644 (file)
--- a/java/org/apache/naming/NamingEntry.java
+++ b/java/org/apache/naming/NamingEntry.java
@@ -66,7 +66,7 @@ public class NamingEntry {
 
     @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;

diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java
index 592df54..d9a58ea 100644 (file)
--- a/java/org/apache/tomcat/util/net/URL.java
+++ b/java/org/apache/tomcat/util/net/URL.java
@@ -304,8 +304,6 @@ public final class URL implements Serializable {
     @Override
     public boolean equals(Object obj) {
 
-        if (obj == null)
-            return (false);
         if (!(obj instanceof URL))
             return (false);
         URL other = (URL) obj;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 45c6f78..2827e8c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,9 @@
       <fix>
         Code clean-up to remove unused code and reduce IDE warnings. (markt)
       </fix>
+      <fix>
+        <bug>50601</bug>: Code clean-up. Patch provided by sebb. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>