--- jsr166/src/test/tck/RecursiveTaskTest.java	2009/08/01 21:56:02	1.3
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2009/08/04 10:13:48	1.6
@@ -135,7 +135,7 @@ public class RecursiveTaskTest extends J
                         threadAssertTrue(f.isDone());
                         return r;
                     } catch (Exception ex) {
-                        unexpectedException();
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }
@@ -157,7 +157,7 @@ public class RecursiveTaskTest extends J
                         threadAssertTrue(f.isDone());
                         return r;
                     } catch (Exception ex) {
-                        unexpectedException();
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }
@@ -261,7 +261,7 @@ public class RecursiveTaskTest extends J
     }
 
     /**
-     * quietelyInvoke task returns when task completes abnormally
+     * quietlyInvoke task returns when task completes abnormally
      */
     public void testAbnormalQuietlyInvoke() {
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
@@ -307,7 +307,9 @@ public class RecursiveTaskTest extends J
                         Integer r = f.get();
                         shouldThrow();
                         return r;
-                    } catch (Exception success) {
+                    } catch (ExecutionException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }
@@ -327,7 +329,9 @@ public class RecursiveTaskTest extends J
                         Integer r = f.get(5L, TimeUnit.SECONDS);
                         shouldThrow();
                         return r;
-                    } catch (Exception success) {
+                    } catch (ExecutionException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }
@@ -449,7 +453,9 @@ public class RecursiveTaskTest extends J
                         Integer r = f.get();
                         shouldThrow();
                         return r;
-                    } catch (Exception success) {
+                    } catch (CancellationException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }
@@ -470,7 +476,9 @@ public class RecursiveTaskTest extends J
                         Integer r = f.get(5L, TimeUnit.SECONDS);
                         shouldThrow();
                         return r;
-                    } catch (Exception success) {
+                    } catch (CancellationException success) {
+                    } catch (Exception ex) {
+                        unexpectedException(ex);
                     }
                     return NoResult;
                 }