Author: bodewig
Date: Fri Oct 28 09:29:14 2011
New Revision: 1190219
URL: http://svn.apache.org/viewvc?rev=1190219&view=rev
Log:
make loadfile/resource less noisy for empty resources when asked to be quiet.
PR 52107.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1190219&r1=1190218&r2=1190219&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Oct 28 09:29:14 2011
@@ -130,6 +130,12 @@ Other changes:
deleting empty directories on NFS shares.
Bugzilla Report 45807.
+ * <loadfile> and <loadresource> 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
===================================
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java?rev=1190219&r1=1190218&r2=1190219&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java Fri
Oct 28 09:29:14 2011
@@ -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) {
