--- jsr166/src/test/tck/RecursiveTaskTest.java	2009/08/01 22:09:13	1.4
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2009/08/04 10:00:15	1.5
@@ -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;
                 }