From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 7 Feb 2010 21:17:02 +0000 (+0000)
Subject: Skip null publicIds
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4d93e771c4eb59d9e762bb88a9fbef274de3b2e6;p=tomcat7.0

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 8246ad31b..314ce656e 100644
--- 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)) {