Author: markt
Date: Tue Sep 8 10:17:49 2015
New Revision: 1701765
URL: http://svn.apache.org/r1701765
Log:
Correct logic in r1701760
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=1701765&r1=1701764&r2=1701765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Sep 8
10:17:49 2015
@@ -1334,8 +1334,8 @@ public class HostConfig implements Lifec
// missed. See Bug 57765.
if ((resource.lastModified() != lastModified &&
(!host.getAutoDeploy() ||
- resource.lastModified() <
currentTimeWithResolutionOffset) ||
- skipFileModificationResolutionCheck) ||
+ resource.lastModified() <
currentTimeWithResolutionOffset ||
+ skipFileModificationResolutionCheck)) ||
update) {
if (!update) {
// Reload application
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
