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

[markt]

Author: markt
Date: Sun Feb  7 21:26:28 2010
New Revision: 907497

URL: http://svn.apache.org/viewvc?rev=907497&view=rev
Log:
Avoid NPEs

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=907497&r1=907496&r2=907497&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:26:28 2010
@@ -1934,7 +1934,9 @@
         }
         
         if (dest.getLoadOnStartup() == null) {
-            dest.setLoadOnStartup(src.getLoadOnStartup().toString());
+            if (src.getLoadOnStartup() != null) {
+                dest.setLoadOnStartup(src.getLoadOnStartup().toString());
+            }
         } else if (src.getLoadOnStartup() != null) {
             if (failOnConflict &&
                     !src.getLoadOnStartup().equals(dest.getLoadOnStartup())) {
@@ -1943,7 +1945,9 @@
         }
         
         if (dest.getEnabled() == null) {
-            dest.setEnabled(src.getEnabled().toString());
+            if (src.getEnabled() != null) {
+                dest.setEnabled(src.getEnabled().toString());
+            }
         } else if (src.getEnabled() != null) {
             if (failOnConflict &&
                     !src.getEnabled().equals(dest.getEnabled())) {
@@ -1971,7 +1975,9 @@
         }
         
         if (dest.getAsyncSupported() == null) {
-            dest.setAsyncSupported(src.getAsyncSupported().toString());
+            if (src.getAsyncSupported() != null) {
+                dest.setAsyncSupported(src.getAsyncSupported().toString());
+            }
         } else if (src.getAsyncSupported() != null) {
             if (failOnConflict &&
                     !src.getAsyncSupported().equals(dest.getAsyncSupported())) 
{



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