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.1 by dl, Sun Jul 21 22:24:18 2013 UTC vs.
Revision 1.3 by jsr166, Mon Jul 22 18:01:03 2013 UTC

# Line 32 | Line 32 | public class ForkJoinTask8Test extends J
32      static final short INITIAL_STATE = -1;
33      static final short COMPLETE_STATE = 0;
34      static final short EXCEPTION_STATE = 1;
35        
35  
36      public static void main(String[] args) {
37          junit.textui.TestRunner.run(suite());
# Line 206 | Line 205 | public class ForkJoinTask8Test extends J
205          }
206  
207          protected void onComplete(BinaryAsyncAction x, BinaryAsyncAction y) {
208 <            if (this.getForkJoinTaskTag() != COMPLETE_STATE ||
209 <                x.getForkJoinTaskTag() != COMPLETE_STATE ||
208 >            if (this.getForkJoinTaskTag() != COMPLETE_STATE ||
209 >                x.getForkJoinTaskTag() != COMPLETE_STATE ||
210                  y.getForkJoinTaskTag() != COMPLETE_STATE) {
211                  completeThisExceptionally(new FJException());
212              }
# Line 241 | Line 240 | public class ForkJoinTask8Test extends J
240                  a.sibling = null;
241                  a.parent = null;
242                  a.completeThis();
243 <                if (p == null ||
243 >                if (p == null ||
244                      p.compareAndSetForkJoinTaskTag(INITIAL_STATE, COMPLETE_STATE))
245                      break;
246                  try {
# Line 279 | Line 278 | public class ForkJoinTask8Test extends J
278              super.reinitialize();
279          }
280  
282
281      }
282  
283      static final class AsyncFib extends BinaryAsyncAction {
# Line 304 | Line 302 | public class ForkJoinTask8Test extends J
302                  }
303                  f.complete();
304              }
305 <            catch(Throwable ex) {
305 >            catch (Throwable ex) {
306                  compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE);
307              }
308              return false;
# Line 573 | Line 571 | public class ForkJoinTask8Test extends J
571          testInvokeOnPool(mainPool(), a);
572      }
573  
576
574      /**
575       * getPool of executing task returns its pool
576       */
# Line 1395 | Line 1392 | public class ForkJoinTask8Test extends J
1392          testInvokeOnPool(singletonPool(), a);
1393      }
1394  
1398
1395      /**
1396       * ForkJoinTask.quietlyComplete returns when task completes
1397       * normally without setting a value. The most recent value

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines