svn commit: r907494 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java

[markt]

Author: markt
Date: Sun Feb  7 21:17:02 2010
New Revision: 907494

URL: http://svn.apache.org/viewvc?rev=907494&view=rev
Log:
Skip null publicIds

Modified:
    tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=907494&r1=907493&r2=907494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Feb  7 
21:17:02 2010
@@ -166,7 +166,9 @@
     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)) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org