Author: markt
Date: Tue Jul 19 11:41:08 2011
New Revision: 1148277
URL: http://svn.apache.org/viewvc?rev=1148277&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51518
Correct error in web.xml parsing rules for the <others/> tag when using
absolute ordering.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1148277&r1=1148276&r2=1148277&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Jul 19
11:41:08 2011
@@ -180,7 +180,7 @@ public class WebRuleSet extends RuleSetB
new RelativeOrderingRule());
digester.addCallMethod(fullPrefix + "/absolute-ordering/name",
"addAbsoluteOrdering", 0);
- digester.addCallMethod(fullPrefix +
"/absolute-ordering/name/others",
+ digester.addCallMethod(fullPrefix + "/absolute-ordering/others",
"addAbsoluteOrderingOthers");
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1148277&r1=1148276&r2=1148277&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 19 11:41:08 2011
@@ -62,6 +62,10 @@
caused tomcat-jdbc.jar and commons-beanutils*.jar to be not
ignored when scanning jars for tag libraries. (kkolinko)
</fix>
+ <fix>
+ <bug>51518</bug>: Correct error in web.xml parsing rules for the
+ <others/> tag when using absolute ordering. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
