Author: markt
Date: Wed Jan 19 19:08:36 2011
New Revision: 1060907
URL: http://svn.apache.org/viewvc?rev=1060907&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50601
Code clean-up
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/naming/NamingEntry.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
Wed Jan 19 19:08:36 2011
@@ -54,9 +54,6 @@ public class ApplicationTaglibDescriptor
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
if (!(obj instanceof ApplicationTaglibDescriptor)) {
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java Wed Jan 19
19:08:36 2011
@@ -195,8 +195,6 @@ public class LoginConfig implements Seri
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;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 19 19:08:36 2011
@@ -353,7 +353,6 @@ public abstract class AbstractReplicated
@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;
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Wed Jan 19 19:08:36
2011
@@ -180,9 +180,6 @@ public abstract class SimpleNode extends
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
if (!(obj instanceof SimpleNode)) {
return false;
}
Modified: tomcat/trunk/java/org/apache/naming/NamingEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingEntry.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingEntry.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingEntry.java Wed Jan 19 19:08:36
2011
@@ -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;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Wed Jan 19 19:08:36
2011
@@ -304,8 +304,6 @@ public final class URL implements Serial
@Override
public boolean equals(Object obj) {
- if (obj == null)
- return (false);
if (!(obj instanceof URL))
return (false);
URL other = (URL) obj;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1060907&r1=1060906&r2=1060907&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 19 19:08:36 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
