ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.65 by jsr166, Tue Oct 6 21:22:54 2015 UTC vs.
Revision 1.66 by jsr166, Tue Oct 6 23:16:51 2015 UTC

#	Line 64 | Line 64 | public class ForkJoinPoolTest extends JS
64		}
65		}
66
67	+	static class MyError extends Error {}
68	+
69		// to test handlers
70		static class FailingFJWSubclass extends ForkJoinWorkerThread {
71		public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
72	<	protected void onStart() { super.onStart(); throw new Error(); }
72	>	protected void onStart() { super.onStart(); throw new MyError(); }
73		}
74
75		static class FailingThreadFactory
#	Line 259 | Line 261 | public class ForkJoinPoolTest extends JS
261		final Thread.UncaughtExceptionHandler ueh =
262		new Thread.UncaughtExceptionHandler() {
263		public void uncaughtException(Thread t, Throwable e) {
264	+	threadAssertTrue(e instanceof MyError);
265	+	threadAssertTrue(t instanceof FailingFJWSubclass);
266		uehInvoked.countDown();
267		}};
268		ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
#	Line 266 | Line 270 | public class ForkJoinPoolTest extends JS
270		try (PoolCleaner cleaner = cleaner(p)) {
271		assertSame(ueh, p.getUncaughtExceptionHandler());
272		try {
273	<	try {
274	<	p.execute(new FibTask(8));
271	<	await(uehInvoked);
272	<	} catch (RejectedExecutionException ok) {}
273	>	p.execute(new FibTask(8));
274	>	await(uehInvoked);
275		} finally {
276		p.shutdownNow(); // failure might have prevented processing task
277		}

Diff Legend

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