--- jsr166/src/test/tck/RecursiveTaskTest.java	2021/01/26 13:33:06	1.42
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2021/01/27 01:57:24	1.43
@@ -228,7 +228,7 @@ public class RecursiveTaskTest extends J
      * returns value;
      */
     public void testInvoke() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 Integer r = f.invoke();
@@ -245,7 +245,7 @@ public class RecursiveTaskTest extends J
      * completed tasks
      */
     public void testQuietlyInvoke() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 f.quietlyInvoke();
@@ -259,7 +259,7 @@ public class RecursiveTaskTest extends J
      * join of a forked task returns when task completes
      */
     public void testForkJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
@@ -275,7 +275,7 @@ public class RecursiveTaskTest extends J
      * get of a forked task returns when task completes
      */
     public void testForkGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
@@ -291,7 +291,7 @@ public class RecursiveTaskTest extends J
      * timed get of a forked task returns when task completes
      */
     public void testForkTimedGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
@@ -307,7 +307,7 @@ public class RecursiveTaskTest extends J
      * quietlyJoin of a forked task returns when task completes
      */
     public void testForkQuietlyJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
@@ -325,7 +325,7 @@ public class RecursiveTaskTest extends J
      * getQueuedTaskCount returns 0 when quiescent
      */
     public void testForkHelpQuiesce() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
@@ -343,7 +343,7 @@ public class RecursiveTaskTest extends J
      * invoke task throws exception when task completes abnormally
      */
     public void testAbnormalInvoke() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 try {
@@ -361,7 +361,7 @@ public class RecursiveTaskTest extends J
      * quietlyInvoke task returns when task completes abnormally
      */
     public void testAbnormalQuietlyInvoke() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 f.quietlyInvoke();
@@ -376,7 +376,7 @@ public class RecursiveTaskTest extends J
      * join of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
@@ -395,7 +395,7 @@ public class RecursiveTaskTest extends J
      * get of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
@@ -416,7 +416,7 @@ public class RecursiveTaskTest extends J
      * timed get of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkTimedGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
@@ -437,7 +437,7 @@ public class RecursiveTaskTest extends J
      * quietlyJoin of a forked task returns when task completes abnormally
      */
     public void testAbnormalForkQuietlyJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
@@ -453,7 +453,7 @@ public class RecursiveTaskTest extends J
      * invoke task throws exception when task cancelled
      */
     public void testCancelledInvoke() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
@@ -472,7 +472,7 @@ public class RecursiveTaskTest extends J
      * join of a forked task throws exception when task cancelled
      */
     public void testCancelledForkJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
@@ -492,7 +492,7 @@ public class RecursiveTaskTest extends J
      * get of a forked task throws exception when task cancelled
      */
     public void testCancelledForkGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
@@ -512,7 +512,7 @@ public class RecursiveTaskTest extends J
      * timed get of a forked task throws exception when task cancelled
      */
     public void testCancelledForkTimedGet() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() throws Exception {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
@@ -532,7 +532,7 @@ public class RecursiveTaskTest extends J
      * quietlyJoin of a forked task returns when task cancelled
      */
     public void testCancelledForkQuietlyJoin() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
@@ -549,7 +549,7 @@ public class RecursiveTaskTest extends J
      */
     public void testGetPool() {
         final ForkJoinPool mainPool = mainPool();
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 assertSame(mainPool, getPool());
                 return NoResult;
@@ -561,7 +561,7 @@ public class RecursiveTaskTest extends J
      * getPool of non-FJ task returns null
      */
     public void testGetPool2() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 assertNull(getPool());
                 return NoResult;
@@ -573,7 +573,7 @@ public class RecursiveTaskTest extends J
      * inForkJoinPool of executing task returns true
      */
     public void testInForkJoinPool() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 assertTrue(inForkJoinPool());
                 return NoResult;
@@ -585,7 +585,7 @@ public class RecursiveTaskTest extends J
      * inForkJoinPool of non-FJ task returns false
      */
     public void testInForkJoinPool2() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 assertFalse(inForkJoinPool());
                 return NoResult;
@@ -597,7 +597,7 @@ public class RecursiveTaskTest extends J
      * The value set by setRawResult is returned by getRawResult
      */
     public void testSetRawResult() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 setRawResult(NoResult);
                 assertSame(NoResult, getRawResult());
@@ -611,7 +611,7 @@ public class RecursiveTaskTest extends J
      * A reinitialized normally completed task may be re-invoked
      */
     public void testReinitialize() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 checkNotDone(f);
@@ -633,7 +633,7 @@ public class RecursiveTaskTest extends J
      * A reinitialized abnormally completed task may be re-invoked
      */
     public void testReinitializeAbnormal() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 checkNotDone(f);
@@ -657,7 +657,7 @@ public class RecursiveTaskTest extends J
      * invoke task throws exception after invoking completeExceptionally
      */
     public void testCompleteExceptionally() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 f.completeExceptionally(new FJException());
@@ -676,7 +676,7 @@ public class RecursiveTaskTest extends J
      * invoke task suppresses execution invoking complete
      */
     public void testComplete() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 f.complete(NoResult);
@@ -692,7 +692,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(t1, t2) invokes all task arguments
      */
     public void testInvokeAll2() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
@@ -708,7 +708,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(tasks) with 1 argument invokes task
      */
     public void testInvokeAll1() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 invokeAll(f);
@@ -722,7 +722,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(tasks) with > 2 argument invokes tasks
      */
     public void testInvokeAll3() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
@@ -743,12 +743,12 @@ public class RecursiveTaskTest extends J
      * invokeAll(collection) invokes all tasks in the collection
      */
     public void testInvokeAllCollection() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
                 FibTask h = new FibTask(7);
-                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
+                HashSet<ForkJoinTask<?>> set = new HashSet<>();
                 set.add(f);
                 set.add(g);
                 set.add(h);
@@ -768,7 +768,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(tasks) with any null task throws NPE
      */
     public void testInvokeAllNPE() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
@@ -786,7 +786,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(t1, t2) throw exception if any task does
      */
     public void testAbnormalInvokeAll2() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FailingFibTask g = new FailingFibTask(9);
@@ -805,7 +805,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(tasks) with 1 argument throws exception if task does
      */
     public void testAbnormalInvokeAll1() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask g = new FailingFibTask(9);
                 try {
@@ -823,7 +823,7 @@ public class RecursiveTaskTest extends J
      * invokeAll(tasks) with > 2 argument throws exception if any task does
      */
     public void testAbnormalInvokeAll3() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 FailingFibTask g = new FailingFibTask(9);
@@ -843,12 +843,12 @@ public class RecursiveTaskTest extends J
      * invokeAll(collection) throws exception if any task does
      */
     public void testAbnormalInvokeAllCollection() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 FibTask g = new FibTask(9);
                 FibTask h = new FibTask(7);
-                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
+                HashSet<ForkJoinTask<?>> set = new HashSet<>();
                 set.add(f);
                 set.add(g);
                 set.add(h);
@@ -868,7 +868,7 @@ public class RecursiveTaskTest extends J
      * and suppresses execution
      */
     public void testTryUnfork() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -888,7 +888,7 @@ public class RecursiveTaskTest extends J
      * there are more tasks than threads
      */
     public void testGetSurplusQueuedTaskCount() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask h = new FibTask(7);
                 assertSame(h, h.fork());
@@ -911,7 +911,7 @@ public class RecursiveTaskTest extends J
      * peekNextLocalTask returns most recent unexecuted task.
      */
     public void testPeekNextLocalTask() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -931,7 +931,7 @@ public class RecursiveTaskTest extends J
      * without executing it
      */
     public void testPollNextLocalTask() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -950,7 +950,7 @@ public class RecursiveTaskTest extends J
      * pollTask returns an unexecuted task without executing it
      */
     public void testPollTask() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -969,7 +969,7 @@ public class RecursiveTaskTest extends J
      * peekNextLocalTask returns least recent unexecuted task in async mode
      */
     public void testPeekNextLocalTaskAsync() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -990,7 +990,7 @@ public class RecursiveTaskTest extends J
      * executing it, in async mode
      */
     public void testPollNextLocalTaskAsync() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());
@@ -1010,7 +1010,7 @@ public class RecursiveTaskTest extends J
      * async mode
      */
     public void testPollTaskAsync() {
-        RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
+        RecursiveTask<Integer> a = new CheckedRecursiveTask<>() {
             public Integer realCompute() {
                 FibTask g = new FibTask(9);
                 assertSame(g, g.fork());