ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinTaskTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinTaskTest.java (file contents):
Revision 1.40 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.43 by dl, Mon Oct 5 23:32:07 2015 UTC

# Line 22 | Line 22 | import junit.framework.TestSuite;
22   public class ForkJoinTaskTest extends JSR166TestCase {
23  
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run(suite());
25 >        main(suite(), args);
26      }
27  
28      public static Test suite() {
# Line 48 | Line 48 | public class ForkJoinTaskTest extends JS
48      }
49  
50      private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
51 <        try {
51 >        try (PoolCleaner cleaner = cleaner(pool)) {
52              assertFalse(a.isDone());
53              assertFalse(a.isCompletedNormally());
54              assertFalse(a.isCompletedAbnormally());
# Line 64 | Line 64 | public class ForkJoinTaskTest extends JS
64              assertFalse(a.isCancelled());
65              assertNull(a.getException());
66              assertNull(a.getRawResult());
67        } finally {
68            joinPool(pool);
67          }
68      }
69  
# Line 218 | Line 216 | public class ForkJoinTaskTest extends JS
216              AtomicIntegerFieldUpdater.newUpdater(BinaryAsyncAction.class,
217                                                   "controlState");
218  
219 <        private BinaryAsyncAction parent;
219 >        private volatile BinaryAsyncAction parent;
220  
221 <        private BinaryAsyncAction sibling;
221 >        private volatile BinaryAsyncAction sibling;
222  
223          protected BinaryAsyncAction() {
224          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines