antoine 2004/07/17 08:13:47
Modified: . Tag: ANT_16_BRANCH WHATSNEW CONTRIBUTORS
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
AbstractCvsTask.java
Log:
Merge from HEAD
PR: 30097
Submitted by: Will Wang
Revision Changes Path
No revision
No revision
1.503.2.119 +15 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.118
retrieving revision 1.503.2.119
diff -u -r1.503.2.118 -r1.503.2.119
--- WHATSNEW 16 Jul 2004 07:37:11 -0000 1.503.2.118
+++ WHATSNEW 17 Jul 2004 15:13:47 -0000 1.503.2.119
@@ -1,3 +1,18 @@
+Changes from Ant 1.6.2 to current Ant 1.6 CVS version
+=====================================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+Other changes:
+--------------
+
+Fixed bugs:
+-----------
+
+* AbstractCvsTask prematurely closed its outputStream and errorStream.
+ Bugzilla 30097.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
1.1.2.21 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- CONTRIBUTORS 2 Jul 2004 07:24:56 -0000 1.1.2.20
+++ CONTRIBUTORS 17 Jul 2004 15:13:47 -0000 1.1.2.21
@@ -199,6 +199,7 @@
Tom Dimock
Tom Eugelink
Ulrich Schmidt
+Will Wang
William Ferguson
Wolfgang Werner
Wolf Siberski
No revision
No revision
1.26.2.8 +15 -15
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -r1.26.2.7 -r1.26.2.8
--- AbstractCvsTask.java 14 Apr 2004 15:42:40 -0000 1.26.2.7
+++ AbstractCvsTask.java 17 Jul 2004 15:13:47 -0000 1.26.2.8
@@ -365,21 +365,6 @@
} else {
log("Caught exception: " + e.getMessage(), Project.MSG_WARN);
}
- } finally {
- if (outputStream != null) {
- try {
- outputStream.close();
- } catch (IOException e) {
- //ignore
- }
- }
- if (errorStream != null) {
- try {
- errorStream.close();
- } catch (IOException e) {
- //ignore
- }
- }
}
}
@@ -413,6 +398,21 @@
removeCommandline(cloned);
}
setCommand(savedCommand);
+
+ if (outputStream != null) {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ //ignore
+ }
+ }
+ if (errorStream != null) {
+ try {
+ errorStream.close();
+ } catch (IOException e) {
+ //ignore
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
