Author: kfujino Date: Thu Sep 11 08:36:32 2014 New Revision: 1624223 URL: http://svn.apache.org/r1624223 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/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1624223&r1=1624222&r2=1624223&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Sep 11 08:36:32 2014 @@ -1063,7 +1063,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(configBase(), Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1624223&r1=1624222&r2=1624223&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 11 08:36:32 2014 @@ -151,6 +151,10 @@ version. Make sure that Tomcat does not undeploy older Context if current context is not running. (kfujino) </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