--- jsr166/src/test/tck/RecursiveTaskTest.java	2010/11/23 08:48:23	1.25
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2011/06/18 14:33:38	1.29
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
@@ -153,7 +153,7 @@ public class RecursiveTaskTest extends J
         assertFalse(a.isCancelled());
         assertFalse(a.isCompletedNormally());
         assertTrue(a.isCompletedAbnormally());
-        assertSame(t, a.getException());
+        assertSame(t.getClass(), a.getException().getClass());
         assertNull(a.getRawResult());
         assertFalse(a.cancel(false));
         assertFalse(a.cancel(true));
@@ -162,26 +162,26 @@ public class RecursiveTaskTest extends J
             a.join();
             shouldThrow();
         } catch (Throwable expected) {
-            assertSame(t, expected);
+            assertSame(t.getClass(), expected.getClass());
         }
 
         try {
             a.get();
             shouldThrow();
         } catch (ExecutionException success) {
-            assertSame(t, success.getCause());
+            assertSame(t.getClass(), success.getCause().getClass());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         try {
             a.get(5L, SECONDS);
             shouldThrow();
         } catch (ExecutionException success) {
-            assertSame(t, success.getCause());
+            assertSame(t.getClass(), success.getCause().getClass());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    static final class FJException extends RuntimeException {
-        FJException() { super(); }
+    public static final class FJException extends RuntimeException {
+        public FJException() { super(); }
     }
 
     // An invalid return value for Fib
@@ -319,7 +319,6 @@ public class RecursiveTaskTest extends J
         assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * helpQuiesce returns when tasks are complete.
      * getQueuedTaskCount returns 0 when quiescent
@@ -329,7 +328,7 @@ public class RecursiveTaskTest extends J
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
-                f.helpQuiesce();
+                helpQuiesce();
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f, 21);
                 return NoResult;
@@ -337,7 +336,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invoke task throws exception when task completes abnormally
      */
@@ -763,7 +761,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invokeAll(tasks) with any null task throws NPE
      */