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.66 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.68 by jsr166, Sun Oct 31 18:33:47 2010 UTC

#	Line 616 | Line 616 | public class JSR166TestCase extends Test
616		Thread.State s = thread.getState();
617		if (s == Thread.State.BLOCKED ||
618		s == Thread.State.WAITING ||
619	<	s == Thread.State.TIMED_WAITING ||
620	<	System.nanoTime() - t0 > timeoutNanos)
619	>	s == Thread.State.TIMED_WAITING)
620		return;
621	+	else if (s == Thread.State.TERMINATED)
622	+	fail("Unexpected thread termination");
623	+	else if (System.nanoTime() - t0 > timeoutNanos) {
624	+	threadAssertTrue(thread.isAlive());
625	+	return;
626	+	}
627		Thread.yield();
628		}
629		}
#	Line 631 | Line 636 | public class JSR166TestCase extends Test
636		long millisElapsedSince(long startNanoTime) {
637		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
638		}
639	<
639	>
640		/**
641		* Returns a new started daemon Thread running the given runnable.
642		*/

Diff Legend

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