Author: kfujino
Date: Tue Jul 13 04:44:25 2010
New Revision: 963599
URL: http://svn.apache.org/viewvc?rev=963599&view=rev
Log:
Avoid NullPointerException, when copyXML=true and META-INF/context.xml does not
exist.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=963599&r1=963598&r2=963599&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jul 13
04:44:25 2010
@@ -846,7 +846,7 @@ public class HostConfig
if (entry != null) {
xmlInWar = true;
}
- if (copyXML) {
+ if (copyXML && xmlInWar) {
istream = jar.getInputStream(entry);
ostream =
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=963599&r1=963598&r2=963599&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 13 04:44:25 2010
@@ -29,6 +29,7 @@
<author email="rj...@apache.org">Rainer Jung</author>
<author email="kkoli...@apache.org">Konstantin Kolinko</author>
<author email="p...@apache.org">Peter Rossbach</author>
+ <author email="kfuj...@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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
