Author: kkolinko
Date: Fri Jun 20 12:39:27 2014
New Revision: 1604163
URL: http://svn.apache.org/r1604163
Log:
Fix bug in StandardContext.removeApplicationListener() introduced by the fix
for BZ 56588.
This was noted by FindBugs as "Calling String[].equals(String)".
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1604163&r1=1604162&r2=1604163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Jun 20
12:39:27 2014
@@ -3806,7 +3806,7 @@ public class StandardContext extends Con
// Make sure this welcome file is currently present
int n = -1;
for (int i = 0; i < applicationListeners.length; i++) {
- if (applicationListeners.equals(listener)) {
+ if (applicationListeners[i].equals(listener)) {
n = i;
break;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1604163&r1=1604162&r2=1604163&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 20 12:39:27 2014
@@ -56,6 +56,10 @@
<code>Method.isAnnotationPresent()</code>. Based on a patch by Jian
Mou.
(markt/kkolinko)
</scode>
+ <fix>
+ Fix regression in
<code>StandardContext.removeApplicationListener()</code>,
+ introduced by the fix for bug <bug>56588</bug>. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
