ViewVC Help

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

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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.120 by jsr166, Wed Jun 25 15:32:10 2014 UTC vs.
Revision 1.121 by jsr166, Wed Jul 9 16:51:40 2014 UTC

#	Line 630 | Line 630 | public class JSR166TestCase extends Test
630		void joinPool(ExecutorService exec) {
631		try {
632		exec.shutdown();
633	<	assertTrue("ExecutorService did not terminate in a timely manner",
634	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
633	>	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
634	>	fail("ExecutorService " + exec +
635	>	" did not terminate in a timely manner");
636		} catch (SecurityException ok) {
637		// Allowed in case test doesn't have privs
638		} catch (InterruptedException ie) {

Diff Legend

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