ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/LinkedTransferQueue.java

Comparing jsr166/src/main/java/util/concurrent/LinkedTransferQueue.java (file contents):
Revision 1.83 by jsr166, Wed Mar 4 00:22:30 2015 UTC vs.
Revision 1.84 by dl, Fri Mar 6 00:23:21 2015 UTC

#	Line 676 | Line 676 | public class LinkedTransferQueue<E> exte
676		return itemE;
677		}
678		else if (w.isInterrupted() || (timed && nanos <= 0)) {
679	<	unsplice(pred, s);            // try to unlink and cancel
680	<	if (s.casItem(e, s))          // return normally if lost CAS
679	>	unsplice(pred, s);           // try to unlink and cancel
680	>	if (s.casItem(e, s))         // return normally if lost CAS
681		return e;
682		}
683	<	else if (spins < 0) {             // establish spins at/near front
683	>	else if (spins < 0) {            // establish spins at/near front
684		if ((spins = spinsFor(pred, s.isData)) > 0)
685		randomYields = ThreadLocalRandom.current();
686		}

Diff Legend

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