Avoid NullPointerException, when copyXML=true and META-INF/context.xml does not exist.

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

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index 3b81634..f6b6582 100644 (file)
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -846,7 +846,7 @@ public class HostConfig
                 if (entry != null) {
                     xmlInWar = true;
                 }
-                if (copyXML) {
+                if (copyXML && xmlInWar) {
                     istream = jar.getInputStream(entry);
                     
                     ostream =

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d04104a..902f392 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -29,6 +29,7 @@
     <author email="rjung@apache.org">Rainer Jung</author>
     <author email="kkolinko@apache.org">Konstantin Kolinko</author>
     <author email="pero@apache.org">Peter Rossbach</author>
+    <author email="kfujino@apache.org">Keiichi Fujino</author>    
     <title>Changelog</title>
   </properties>
 
@@ -140,6 +141,10 @@
         Random to generate nonces. Also make the implementation class used user
         configurable. (markt)
       </fix>
+      <fix>
+        Avoid NullPointerException, when copyXML=true and META-INF/context.xml 
+        does not exist. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">