Author: markt
Date: Wed Apr 1 16:44:02 2015
New Revision: 1670724
URL: http://svn.apache.org/r1670724
Log:
Really make sure that HostConfig thinks the files have been modified.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1670724&r1=1670723&r2=1670724&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Wed Apr 1 16:44:02 2015
@@ -1715,7 +1715,7 @@ public class TestHostConfigAutomaticDepl
Files.copy(XML_SOURCE.toPath(), xml.toPath());
// Make sure that HostConfig thinks the xml has been modified.
xml.setLastModified(
- System.currentTimeMillis() -
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
return xml;
}
@@ -1751,7 +1751,7 @@ public class TestHostConfigAutomaticDepl
}
// Make sure that HostConfig thinks the xml has been modified.
xml.setLastModified(
- System.currentTimeMillis() -
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
return xml;
}
@@ -1774,7 +1774,7 @@ public class TestHostConfigAutomaticDepl
// Make sure that HostConfig thinks all newly copied files have
// been modified.
destPath.toFile().setLastModified(
- System.currentTimeMillis() -
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
return FileVisitResult.CONTINUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
