ViewVC Help

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

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

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

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

Diff Legend

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