bugzilla 42802: merge back into HEAD

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@557016 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -226,6 +226,7 @@ Robin Green
 Rob Oxspring
 Rob van Oostrum
 Roger Vaughn
+Roman Ivashin
 Ronen Mashal
 Russell Gold
 Sam Ruby

WHATSNEW

@@ -121,6 +121,9 @@ Fixed bugs:
 * ant script, cd may output to stdout.
   Bugzilla 42739.
 
+* Modified selector doesn't update the cache if only one file has changed.
+  Bugzilla 42802.
+
 Other changes:
 --------------
 * <script> now has basic support for JavaFX scripts

contributors.xml

@@ -899,6 +899,10 @@
     <first>Roger</first>
     <last>Vaughn</last>
   </name>
+  <name>
+    <first>Roman</first>
+    <last>Ivashin</last>
+  </name>
   <name>
     <first>Ronen</first>
     <last>Mashal</last>

src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java

@@ -522,7 +522,7 @@ public class ModifiedSelector extends BaseExtendSelector
     * save the cache file
     */
     protected void saveCache() {
-        if (getModified() > 1) {
+        if (getModified() > 0) {
             cache.save();
             setModified(0);
         }

src/tests/antunit/types/modified-selector-test.xml

@@ -0,0 +1,22 @@
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../antunit-base.xml"/>
+  <property name="test-build-dir"
+            location="../../../../build/ant-unit/modified-selector"/>
+
+  <target name="test-one-file">
+    <delete dir="${test-build-dir}"/>
+    <mkdir dir="${test-build-dir}"/>
+    <copy todir="${test-build-dir}" overwrite="yes">
+      <fileset dir="." includes="modified-selector-test.xml">
+        <modified update="true">
+          <param name="cache.cachefile" value="${test-build-dir}/cc.properties"/>
+        </modified>
+      </fileset>
+    </copy>
+
+    <au:assertTrue>
+      <available file="${test-build-dir}/cc.properties"/>
+    </au:assertTrue>
+  </target>
+</project>