peterreilly 2004/04/01 05:07:34
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Parallel.java
Log:
sync with HEAD
Revision Changes Path
No revision
No revision
1.503.2.64 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.63
retrieving revision 1.503.2.64
diff -u -r1.503.2.63 -r1.503.2.64
--- WHATSNEW 31 Mar 2004 11:45:42 -0000 1.503.2.63
+++ WHATSNEW 1 Apr 2004 13:07:34 -0000 1.503.2.64
@@ -104,6 +104,8 @@
* wrong compare used in ProjectComponent for logging. Bugzilla Report 28070.
+* failOnAny attribute for <parallel> was broken. Bugzilla Report 28122.
+
Other changes:
--------------
No revision
No revision
1.24.2.5 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
Index: Parallel.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -r1.24.2.4 -r1.24.2.5
--- Parallel.java 9 Mar 2004 17:01:34 -0000 1.24.2.4
+++ Parallel.java 1 Apr 2004 13:07:34 -0000 1.24.2.5
@@ -417,12 +417,12 @@
task.perform();
} catch (Throwable t) {
exception = t;
+ if (failOnAny) {
+ stillRunning = false;
+ }
} finally {
synchronized (semaphore) {
finished = true;
- if (failOnAny) {
- stillRunning = false;
- }
semaphore.notifyAll();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
