ViewVC Help

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

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

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.26 by jsr166, Tue Nov 23 07:38:40 2010 UTC vs.
Revision 1.27 by jsr166, Tue Nov 23 08:48:23 2010 UTC

#	Line 9 | Line 9 | import java.util.concurrent.Cancellation
9		import java.util.concurrent.SynchronousQueue;
10		import java.util.concurrent.ExecutionException;
11		import java.util.concurrent.ForkJoinPool;
12	+	import java.util.concurrent.ForkJoinTask;
13		import java.util.concurrent.ForkJoinWorkerThread;
14		import java.util.concurrent.RecursiveAction;
15		import java.util.concurrent.TimeUnit;
#	Line 60 | Line 61 | public class RecursiveActionTest extends
61		assertNull(a.getException());
62		assertNull(a.getRawResult());
63
64	<	if (! (Thread.currentThread() instanceof ForkJoinWorkerThread)) {
64	>	if (! ForkJoinTask.inForkJoinPool()) {
65		Thread.currentThread().interrupt();
66		try {
67		a.get();
#	Line 351 | Line 352 | public class RecursiveActionTest extends
352		// test join() ------------
353
354		f = fibActions[0];
355	<	assertFalse(f.inForkJoinPool());
355	>	assertFalse(ForkJoinTask.inForkJoinPool());
356		Thread.currentThread().interrupt();
357		assertNull(f.join());
358		assertTrue(Thread.interrupted());

Diff Legend

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