[Swift-commit] r6268 - branches/faster/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-02-13 13:34:43 -0600 (Wed, 13 Feb 2013)
New Revision: 6268

Modified:
   branches/faster/src/org/griphyn/vdl/karajan/lib/ThrottledParallelFor.java
Log:
fixed propagation of errors in foreach

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/ThrottledParallelFor.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/ThrottledParallelFor.java	2013-02-13 19:34:19 UTC (rev 6267)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/ThrottledParallelFor.java	2013-02-13 19:34:43 UTC (rev 6268)
@@ -258,7 +258,10 @@
                     ts.threadDone(thr2, null);
                 }
                 catch (ExecutionException e) {
-                    throw e;
+                    thr2.getStack().dropToFrame(fcf);
+                    ts.threadDone(thr2, e);
+                    ts.abortAll();
+                    thr.awake();
                 }
                 catch (Exception e) {
                     thr2.getStack().dropToFrame(fcf);