Better handling for public ID when validation is enabled

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

diff --git a/java/org/apache/catalina/deploy/WebXml.java b/java/org/apache/catalina/deploy/WebXml.java
index cd85fc8..06d2c13 100644 (file)
--- a/java/org/apache/catalina/deploy/WebXml.java
+++ b/java/org/apache/catalina/deploy/WebXml.java
@@ -168,7 +168,6 @@ public class WebXml {
     private String publicId = null;
     public String getPublicId() { return publicId; }
     public void setPublicId(String publicId) {
-        this.publicId = publicId;
         // Update major and minor version
         if (publicId == null) {
             // skip
@@ -178,22 +177,30 @@ public class WebXml {
                 equalsIgnoreCase(publicId)) {
             majorVersion = 3;
             minorVersion = 0;
+            this.publicId = publicId;
         } else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_25.
                 equalsIgnoreCase(publicId)) {
             majorVersion = 2;
             minorVersion = 5;
+            this.publicId = publicId;
         } else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_24.
                 equalsIgnoreCase(publicId)) {
             majorVersion = 2;
             minorVersion = 4;
+            this.publicId = publicId;
         } else if (org.apache.catalina.startup.Constants.WebDtdPublicId_23.
                 equalsIgnoreCase(publicId)) {
             majorVersion = 2;
             minorVersion = 3;
+            this.publicId = publicId;
         } else if (org.apache.catalina.startup.Constants.WebDtdPublicId_22.
                 equalsIgnoreCase(publicId)) {
             majorVersion = 2;
             minorVersion = 2;
+            this.publicId = publicId;
+        } else if ("datatypes".equals(publicId)) {
+            // Will occur when validation is enabled and dependencies are
+            // traced back. Ignore it.
         } else {
             // Unrecognised publicId
             log.warn(sm.getString("webxml.unrecognisedPublicId", publicId));