Author: funkman
Date: Sat Feb 16 06:40:24 2008
New Revision: 628307
URL: http://svn.apache.org/viewvc?rev=628307&view=rev
Log:
If listener declared in web.xml, only add it once. (per STATUS)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=628307&r1=628306&r2=628307&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Feb 16 06:40:24 2008
@@ -80,10 +80,6 @@
http://svn.apache.org/viewvc?rev=620778&view=rev
+1: pero,funkman,markt
-* Remove duplicate listner additions
- http://svn.apache.org/viewvc?rev=620844&view=rev
- +1: funkman, pero, jfclere, markt, remm
-
* lib is relative to catalina home, not base
http://svn.apache.org/viewvc?rev=627602&view=rev
+1: markt, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=628307&r1=628306&r2=628307&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Sat
Feb 16 06:40:24 2008
@@ -256,9 +256,6 @@
digester.addCallMethod(prefix +
"web-app/jsp-config/jsp-property-group/url-pattern",
"addJspMapping", 0);
- digester.addCallMethod(prefix + "web-app/listener/listener-class",
- "addApplicationListener", 0);
-
digester.addRule(prefix + "web-app/login-config",
loginConfig);
@@ -902,4 +899,4 @@
if (digester.getLogger().isDebugEnabled())
digester.getLogger().debug("pop SecurityRoleRef");
}
-}
\ No newline at end of file
+}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=628307&r1=628306&r2=628307&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Feb 16 06:40:24 2008
@@ -38,6 +38,9 @@
<fix>
<bug>44337</bug>: Dir listing crashes if no readme-file present
(funkman)
</fix>
+ <fix>
+ If listener declared in web.xml, only add it once. (funkman)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
