Author: markt
Date: Fri Apr 1 01:02:07 2011
New Revision: 1087534
URL: http://svn.apache.org/viewvc?rev=1087534&view=rev
Log:
Another context.xml tracking issue. This time if using just dir deployment.
A changes in context.xml now triggers a redeploy rather than a reload (so the
context.xml is re-read)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
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=1087534&r1=1087533&r2=1087534&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Apr 1
01:02:07 2011
@@ -1055,10 +1055,16 @@ public class HostConfig
host.addChild(context);
deployedApp.redeployResources.put(dir.getAbsolutePath(),
Long.valueOf(dir.lastModified()));
- if (xmlCopy != null) {
- deployedApp.redeployResources.put(
- xmlCopy.getAbsolutePath(),
- Long.valueOf(xmlCopy.lastModified()));
+ if (deployXML && xml.exists()) {
+ if (xmlCopy == null) {
+ deployedApp.redeployResources.put(
+ xml.getAbsolutePath(),
+ Long.valueOf(xml.lastModified()));
+ } else {
+ deployedApp.redeployResources.put(
+ xmlCopy.getAbsolutePath(),
+ Long.valueOf(xmlCopy.lastModified()));
+ }
}
addWatchedResources(deployedApp, dir.getAbsolutePath(), context);
} catch (Throwable t) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
