From ea4b41e1d9eef5fa052179595ab0b01c9895e009 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 28 Oct 2011 09:29:14 +0000 Subject: [PATCH] make loadfile/resource less noisy for empty resources when asked to be quiet. PR 52107. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1190219 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 6 ++++++ src/main/org/apache/tools/ant/taskdefs/LoadResource.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 218cbd2d7..09c1a6df8 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -130,6 +130,12 @@ Other changes: deleting empty directories on NFS shares. Bugzilla Report 45807. + * and used to log at level INFO to signal a + property hasn't been set when the resource was empty even if the + quiet attribute was set to true. They will now use VERBOSE + instead. + Bugzilla Report 52107. + Changes from Ant 1.8.1 TO Ant 1.8.2 =================================== diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java index 0e5856822..5b45879fd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java @@ -179,7 +179,8 @@ public class LoadResource extends Task { text = crh.readFully(instream); } else { - log("Do not set property " + property + " as its length is 0."); + log("Do not set property " + property + " as its length is 0.", + quiet ? Project.MSG_VERBOSE : Project.MSG_INFO); } if (text != null) {