Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47462

Need to be able to override metadata complete if set in the global web.xml
Patch provided by Keiichi Fujino

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

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index 1b7e5fe..78a0564 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -962,6 +962,8 @@ final class IgnoreAnnotationsRule extends Rule {
         String value = attributes.getValue("metadata-complete");
         if ("true".equals(value)) {
             webxml.setMetadataComplete(true);
+        } else if ("false".equals(value)) {
+            webxml.setMetadataComplete(false);
         }
         if (digester.getLogger().isDebugEnabled()) {
             digester.getLogger().debug