From b19b9b4113f6b4944c1ae27812a926157fc09cf8 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Thu, 18 Dec 2003 08:39:06 +0000
Subject: [PATCH] Make checksum work with nested filesets and no total property
 Make checksum less loud, downgrading message calculating checksum to verbose
 PR: 25606 PR: 25607 Submitted by: Ariel Backenroth ( abackenr at interwoven
 dot com )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275806 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                  | 2 ++
 src/etc/testcases/taskdefs/checksum.xml                   | 8 ++++++++
 src/main/org/apache/tools/ant/taskdefs/Checksum.java      | 4 ++--
 .../org/apache/tools/ant/taskdefs/ChecksumTest.java       | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 6560fc843..3a1dc235c 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -93,6 +93,8 @@ Changes that could break older environments:
   are resolved at a later stage. This causes some
   differences especially for user defined task containers.
 
+* <checksum> log message "Calculating checksum ..." has been degraded from INFO to VERBOSE.
+
 Fixed bugs:
 -----------
 * Filter readers were not handling line endings properly.  Bugzilla
diff --git a/src/etc/testcases/taskdefs/checksum.xml b/src/etc/testcases/taskdefs/checksum.xml
index 706adc714..8879c1d45 100644
--- a/src/etc/testcases/taskdefs/checksum.xml
+++ b/src/etc/testcases/taskdefs/checksum.xml
@@ -65,4 +65,12 @@
       </fileset>
     </checksum>
   </target>
+    <!-- bug report 25606 -->
+    <target name="verifyChecksumdirNoTotal">
+      <checksum todir="${basedir}/checksum/checksums">
+        <fileset dir="${basedir}/checksum">
+          <exclude name="**/*.MD5"/>
+        </fileset>
+      </checksum>
+    </target>
 </project>
\ No newline at end of file
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index 9ab445d54..05b854972 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -374,7 +374,7 @@ public class Checksum extends MatchingTask implements Condition {
                 String[] srcFiles = ds.getIncludedFiles();
                 for (int j = 0; j < srcFiles.length; j++) {
                     File src = new File(fs.getDir(getProject()), srcFiles[j]);
-                    if (totalproperty != null) {
+                    if (totalproperty != null || todir != null) {
                         // Use '/' to calculate digest based on file name.
                         // This is required in order to get the same result
                         // on different platforms.
@@ -467,7 +467,7 @@ public class Checksum extends MatchingTask implements Condition {
                 messageDigest.reset();
                 File src = (File) e.nextElement();
                 if (!isCondition) {
-                    log("Calculating " + algorithm + " checksum for " + src);
+                    log("Calculating " + algorithm + " checksum for " + src, Project.MSG_VERBOSE);
                 }
                 fis = new FileInputStream(src);
                 DigestInputStream dis = new DigestInputStream(fis,
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
index e618679ef..2fd1007a6 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
@@ -125,6 +125,9 @@ public class ChecksumTest extends BuildFileTest {
         expectPropertySet("verifyFromProperty", "verify", "true");
     }
 
+    public void testVerifyChecksumdirNoTotal() {
+        executeTarget("verifyChecksumdirNoTotal");
+    }
     private void testVerify(String target) {
         assertNull(project.getProperty("logo.MD5"));
         assertNull(project.getProperty("no.logo.MD5"));