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.

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

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index 5cd206e..7521002 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -180,7 +180,7 @@ public class WebRuleSet extends RuleSetBase {
                     new RelativeOrderingRule());
             digester.addCallMethod(fullPrefix + "/absolute-ordering/name",
                                    "addAbsoluteOrdering", 0);
-            digester.addCallMethod(fullPrefix + "/absolute-ordering/name/others",
+            digester.addCallMethod(fullPrefix + "/absolute-ordering/others",
                                    "addAbsoluteOrderingOthers");
         }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index db9b4e9..f913a84 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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
+        &lt;others/&gt; tag when using absolute ordering. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">