peterreilly 2004/03/11 03:22:10
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs LogOutputStream.java
Log:
exec task outputted two redundant trailing newlines
PR: 27546
Reported by: marcel at schutte dot com
Obtained from: Martijn Kruithof
Revision Changes Path
1.568 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- WHATSNEW 11 Mar 2004 10:52:28 -0000 1.567
+++ WHATSNEW 11 Mar 2004 11:22:10 -0000 1.568
@@ -71,6 +71,10 @@
* if the basedir contained .. or . dirs, and the build file name contained
.. or ., the basedir was set incorrectly. Bugzilla Report 26765.
+
+* regression from ant 1.5, exec task outputted two redundant trailing
newlines.
+ Bugzilla Report 27546.
+
Other changes:
--------------
1.21 +3 -1
ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LogOutputStream.java 9 Mar 2004 16:48:06 -0000 1.20
+++ LogOutputStream.java 11 Mar 2004 11:22:10 -0000 1.21
@@ -85,7 +85,9 @@
* Flush this log stream
*/
public void flush() {
- processBuffer();
+ if (buffer.size() > 0) {
+ processBuffer();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
