diff --git a/docs/manual/CoreTypes/selectors.html b/docs/manual/CoreTypes/selectors.html index 0fe8e0bf8..09374f815 100755 --- a/docs/manual/CoreTypes/selectors.html +++ b/docs/manual/CoreTypes/selectors.html @@ -320,7 +320,7 @@ ignoreFileTimes Whether to use file times in the comparison or not. - Default is true. + Default is false (time differences are significant). No diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java index 78182f4f6..d7410613f 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java @@ -110,14 +110,16 @@ public class DifferentSelector extends MappingSelector { return true; } - //same date if dest timestamp is within granularity of the srcfile - boolean sameDate; - sameDate = destfile.lastModified() >= srcfile.lastModified() - granularity - && destfile.lastModified() <= srcfile.lastModified() + granularity; + if (!ignoreFileTimes) { + //same date if dest timestamp is within granularity of the srcfile + boolean sameDate; + sameDate = destfile.lastModified() >= srcfile.lastModified() - granularity + && destfile.lastModified() <= srcfile.lastModified() + granularity; - //and when ignoreFileTimes is set we claim the files are now equal - if(sameDate && !ignoreFileTimes) { - return true; + // different dates => different files + if(!sameDate) { + return true; + } } //here do a bulk comparison