Skip null publicIds

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

diff --git a/java/org/apache/catalina/deploy/WebXml.java b/java/org/apache/catalina/deploy/WebXml.java
index 8246ad3..314ce65 100644 (file)
--- a/java/org/apache/catalina/deploy/WebXml.java
+++ b/java/org/apache/catalina/deploy/WebXml.java
@@ -166,7 +166,9 @@ public class WebXml {
     public void setPublicId(String publicId) {
         this.publicId = publicId;
         // Update major and minor version
-        if (org.apache.catalina.startup.Constants.WebSchemaPublicId_30.
+        if (publicId == null) {
+            // skip
+        } else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_30.
                 equalsIgnoreCase(publicId) ||
                 org.apache.catalina.startup.Constants.WebFragmentSchemaPublicId_30.
                 equalsIgnoreCase(publicId)) {