ViewVC Help

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

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

Comparing jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java (file contents):
Revision 1.52 by jsr166, Fri Jul 3 05:48:30 2015 UTC vs.
Revision 1.53 by jsr166, Sun Jan 1 20:34:39 2017 UTC

#	Line 238 | Line 238 | public class AbstractQueuedSynchronizerT
238		* default timeout duration).
239		*/
240		void assertAwaitTimesOut(ConditionObject c, AwaitMethod awaitMethod) {
241	<	long timeoutMillis = timeoutMillis();
242	<	long startTime;
241	>	final long timeoutMillis = timeoutMillis();
242	>	final long startTime;
243		try {
244		switch (awaitMethod) {
245		case awaitTimed:
#	Line 258 | Line 258 | public class AbstractQueuedSynchronizerT
258		case awaitUntil:
259		// We shouldn't assume that nanoTime and currentTimeMillis
260		// use the same time source, so don't use nanoTime here.
261	<	java.util.Date delayedDate = delayedDate(timeoutMillis());
261	>	java.util.Date delayedDate = delayedDate(timeoutMillis);
262		assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));
263		assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
264		break;

Diff Legend

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