--- jsr166/src/test/tck/RecursiveActionTest.java	2009/07/31 23:37:31	1.2
+++ jsr166/src/test/tck/RecursiveActionTest.java	2009/08/04 10:13:48	1.6
@@ -135,7 +135,7 @@ public class RecursiveActionTest extends
                         threadAssertTrue(f.result == 21);
                         threadAssertTrue(f.isDone());
                     } catch (Exception ex) {
-                        unexpectedException();
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -155,7 +155,7 @@ public class RecursiveActionTest extends
                         threadAssertTrue(f.result == 21);
                         threadAssertTrue(f.isDone());
                     } catch (Exception ex) {
-                        unexpectedException();
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -172,9 +172,10 @@ public class RecursiveActionTest extends
                         FibAction f = new FibAction(8);
                         f.fork();
                         f.get(5L, null);
+                        shouldThrow();
                     } catch (NullPointerException success) {
                     } catch (Exception ex) {
-                        unexpectedException();
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -268,7 +269,7 @@ public class RecursiveActionTest extends
     }
 
     /**
-     * quietelyInvoke task returns when task completes abnormally
+     * quietlyInvoke task returns when task completes abnormally
      */
     public void testAbnormalQuietlyInvoke() {
         RecursiveAction a = new RecursiveAction() {
@@ -310,7 +311,9 @@ public class RecursiveActionTest extends
                         f.fork();
                         f.get();
                         shouldThrow();
-                    } catch (Exception success) {
+                    } catch (ExecutionException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -328,7 +331,9 @@ public class RecursiveActionTest extends
                         f.fork();
                         f.get(5L, TimeUnit.SECONDS);
                         shouldThrow();
-                    } catch (Exception success) {
+                    } catch (ExecutionException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -440,7 +445,9 @@ public class RecursiveActionTest extends
                         f.fork();
                         f.get();
                         shouldThrow();
-                    } catch (Exception success) {
+                    } catch (CancellationException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -459,7 +466,9 @@ public class RecursiveActionTest extends
                         f.fork();
                         f.get(5L, TimeUnit.SECONDS);
                         shouldThrow();
-                    } catch (Exception success) {
+                    } catch (CancellationException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                 }
             };
@@ -825,7 +834,7 @@ public class RecursiveActionTest extends
     }
 
     /**
-     * invokeAll(collection)  throws exception if any task does
+     * invokeAll(collection) throws exception if any task does
      */
     public void testAbnormalInvokeAllCollection() {
         RecursiveAction a = new RecursiveAction() {