ViewVC Help

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

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

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.77 by jsr166, Fri Jul 3 01:25:15 2015 UTC vs.
Revision 1.78 by jsr166, Fri Jul 3 05:48:30 2015 UTC

#	Line 969 | Line 969 | public class ReentrantReadWriteLockTest
969		new ReentrantReadWriteLock(fair);
970		final Condition c = lock.writeLock().newCondition();
971		lock.writeLock().lock();
972	<	long startTime = System.nanoTime();
973	<	assertFalse(c.awaitUntil(delayedDate(timeoutMillis())));
974	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
972	>	// We shouldn't assume that nanoTime and currentTimeMillis
973	>	// use the same time source, so don't use nanoTime here.
974	>	java.util.Date delayedDate = delayedDate(timeoutMillis());
975	>	assertFalse(c.awaitUntil(delayedDate));
976	>	assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
977		lock.writeLock().unlock();
978		} catch (InterruptedException fail) { threadUnexpectedException(fail); }
979		}

Diff Legend

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