From 41e30df4a56575c8e9181e3fb809e47c39a735ff Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Tue, 17 Jul 2007 18:40:59 +0000
Subject: [PATCH] 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                                  |  1 +
 WHATSNEW                                      |  3 +++
 contributors.xml                              |  4 ++++
 .../modifiedselector/ModifiedSelector.java    |  2 +-
 .../antunit/types/modified-selector-test.xml  | 22 +++++++++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/antunit/types/modified-selector-test.xml

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c452a245e..a0749239a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -226,6 +226,7 @@ Robin Green
 Rob Oxspring
 Rob van Oostrum
 Roger Vaughn
+Roman Ivashin
 Ronen Mashal
 Russell Gold
 Sam Ruby
diff --git a/WHATSNEW b/WHATSNEW
index 0e24f311b..78904619b 100644
--- a/WHATSNEW
+++ b/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
diff --git a/contributors.xml b/contributors.xml
index d5947d69a..3870709b7 100644
--- a/contributors.xml
+++ b/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>
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 52aba4059..04b7a94ce 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/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);
         }
diff --git a/src/tests/antunit/types/modified-selector-test.xml b/src/tests/antunit/types/modified-selector-test.xml
new file mode 100644
index 000000000..9a5d6f420
--- /dev/null
+++ b/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>