From 26ed12e350e6647b532e3ed9e5e94c2de4653734 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 19 Jul 2011 11:41:08 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51518 Correct error in web.xml parsing rules for the tag when using absolute ordering. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1148277 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/WebRuleSet.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java index 5cd206efe..752100223 100644 --- 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 db9b4e979..f913a84f0 100644 --- 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) + + 51518: Correct error in web.xml parsing rules for the + <others/> tag when using absolute ordering. (markt) + -- 2.11.0