ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ForkJoinTask8Test.java

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.2 by jsr166, Mon Jul 22 15:55:43 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 304 | Line 303 | public class ForkJoinTask8Test extends J
303		}
304		f.complete();
305		}
306	<	catch(Throwable ex) {
306	>	catch (Throwable ex) {
307		compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE);
308		}
309		return false;
#	Line 1395 | Line 1394 | public class ForkJoinTask8Test extends J
1394		testInvokeOnPool(singletonPool(), a);
1395		}
1396
1398	–
1397		/**
1398		* ForkJoinTask.quietlyComplete returns when task completes
1399		* normally without setting a value. The most recent value

Diff Legend

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