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

Comparing jsr166/src/test/tck/ForkJoinTask8Test.java (file contents):
Revision 1.15 by dl, Tue Sep 8 23:56:19 2015 UTC vs.
Revision 1.19 by dl, Mon Oct 5 22:59:29 2015 UTC

# Line 74 | Line 74 | public class ForkJoinTask8Test extends J
74      }
75  
76      private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
77 <        try {
77 >        try (PoolCleaner cleaner = cleaner(pool)) {
78              assertFalse(a.isDone());
79              assertFalse(a.isCompletedNormally());
80              assertFalse(a.isCompletedAbnormally());
# Line 90 | Line 90 | public class ForkJoinTask8Test extends J
90              assertFalse(a.isCancelled());
91              assertNull(a.getException());
92              assertNull(a.getRawResult());
93 –        } finally {
94 –            joinPool(pool);
93          }
94      }
95  
# Line 200 | Line 198 | public class ForkJoinTask8Test extends J
198  
199      abstract static class BinaryAsyncAction extends ForkJoinTask<Void> {
200  
201 <        private BinaryAsyncAction parent;
201 >        private volatile BinaryAsyncAction parent;
202  
203 <        private BinaryAsyncAction sibling;
203 >        private volatile BinaryAsyncAction sibling;
204  
205          protected BinaryAsyncAction() {
206              setForkJoinTaskTag(INITIAL_STATE);
# Line 1155 | Line 1153 | public class ForkJoinTask8Test extends J
1153      }
1154  
1155      // jdk9
1156 <    
1156 >
1157      /**
1158       * pollSubmission returns unexecuted submitted task, if present
1159       */
# Line 1165 | Line 1163 | public class ForkJoinTask8Test extends J
1163          final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done));
1164          final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done));
1165          final ForkJoinPool p = singletonPool();
1166 <        Thread external = new Thread() {
1167 <                public void run() {
1166 >        try (PoolCleaner cleaner = cleaner(p)) {
1167 >            Thread external = new Thread(new CheckedRunnable() {
1168 >                public void realRun() {
1169                      p.execute(a);
1170                      p.execute(b);
1171                      p.execute(c);
1172 <                }};
1173 <        RecursiveAction s = new CheckedRecursiveAction() {
1172 >                }});
1173 >            RecursiveAction s = new CheckedRecursiveAction() {
1174                  protected void realCompute() {
1175                      external.start();
1176                      try {
1177                          external.join();
1178 <                    } catch(Exception ex) {
1178 >                    } catch (Exception ex) {
1179                          threadUnexpectedException(ex);
1180                      }
1181                      assertTrue(p.hasQueuedSubmissions());
# Line 1185 | Line 1184 | public class ForkJoinTask8Test extends J
1184                      assertTrue(r == a || r == b || r == c);
1185                      assertFalse(r.isDone());
1186                  }};
1188 –        try {
1187              p.invoke(s);
1190 –        } finally {
1188              done.countDown();
1192 –            joinPool(p);
1189          }
1190      }
1191  
1196 –    
1192   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines