Author: kfujino
Date: Thu Sep 11 08:34:50 2014
New Revision: 1624222
URL: http://svn.apache.org/r1624222
Log:
When deploying war, make sure that add dummy xml to the config base if war does
not have META-INF/context.xml or deployXML is false.
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=1624222&r1=1624221&r2=1624222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Sep 11
08:34:50 2014
@@ -899,7 +899,7 @@ public class HostConfig
if (deployXML && xml.exists() && copyThisXml) {
deployedApp.redeployResources.put(xml.getAbsolutePath(),
Long.valueOf(xml.lastModified()));
- } else if (!copyThisXml ) {
+ } else {
// In case an XML file is added to the config base later
deployedApp.redeployResources.put(
(new File(host.getConfigBaseFile(),
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1624222&r1=1624221&r2=1624222&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 11 08:34:50 2014
@@ -131,6 +131,10 @@
Fix a rare threading issue when using HTTP digest authentication.
(markt)
</fix>
+ <fix>
+ When deploying war, make sure that add dummy xml to the config base if
+ war does not have META-INF/context.xml or deployXML is false. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
