Author: markt
Date: Wed Apr 1 16:28:08 2015
New Revision: 1670719
URL: http://svn.apache.org/r1670719
Log:
Follow-up to r1670433.
If auto-deploy is not enabled, skip the last modified resolution check since
checkResources() will have been explicitly called after the resource has been
updated.
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=1670719&r1=1670718&r2=1670719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Apr 1
16:28:08 2015
@@ -1242,8 +1242,8 @@ public class HostConfig implements Lifec
// modified time has to be more than 1000ms ago to ensure that
// modifications that take place in the same second are not
// missed. See Bug 57765.
- if (resource.lastModified() != lastModified &&
- resource.lastModified() <
currentTimeWithResolutionOffset) {
+ if (resource.lastModified() != lastModified &&
(!host.getAutoDeploy() ||
+ resource.lastModified() <
currentTimeWithResolutionOffset)) {
if (resource.isDirectory()) {
// No action required for modified directory
app.redeployResources.put(resources[i],
@@ -1326,7 +1326,9 @@ public class HostConfig implements Lifec
// modifications that take place in the same second are not
// missed. See Bug 57765.
if ((resource.lastModified() != lastModified &&
- resource.lastModified() < currentTimeWithResolutionOffset)
|| update) {
+ (!host.getAutoDeploy() ||
+ resource.lastModified() <
currentTimeWithResolutionOffset)) ||
+ update) {
if (!update) {
// Reload application
reload(app);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
