peterreilly 2004/03/11 03:22:56
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
LogOutputStream.java
Log:
sync with head
Revision Changes Path
No revision
No revision
1.503.2.58 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.57
retrieving revision 1.503.2.58
diff -u -r1.503.2.57 -r1.503.2.58
--- WHATSNEW 11 Mar 2004 10:54:34 -0000 1.503.2.57
+++ WHATSNEW 11 Mar 2004 11:22:55 -0000 1.503.2.58
@@ -29,6 +29,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:
--------------
No revision
No revision
1.16.2.5 +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.16.2.4
retrieving revision 1.16.2.5
diff -u -r1.16.2.4 -r1.16.2.5
--- LogOutputStream.java 9 Mar 2004 17:01:33 -0000 1.16.2.4
+++ LogOutputStream.java 11 Mar 2004 11:22:56 -0000 1.16.2.5
@@ -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]
