ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/SynchronousQueue.java (file contents):
Revision 1.117 by jsr166, Sat Oct 3 17:26:56 2015 UTC vs.
Revision 1.118 by jsr166, Sat Oct 3 18:17:51 2015 UTC

#	Line 324 | Line 324 | public class SynchronousQueue<E> extends
324		for (;;) {
325		SNode h = head;
326		if (h == null || h.mode == mode) {  // empty or same-mode
327	<	if (timed && nanos <= 0) {      // can't wait
327	>	if (timed && nanos <= 0L) {     // can't wait
328		if (h != null && h.isCancelled())
329		casHead(h, h.next);     // pop cancelled node
330		else
#	Line 652 | Line 652 | public class SynchronousQueue<E> extends
652		advanceTail(t, tn);
653		continue;
654		}
655	<	if (timed && nanos <= 0)        // can't wait
655	>	if (timed && nanos <= 0L)       // can't wait
656		return null;
657		if (s == null)
658		s = new QNode(e, isData);

Diff Legend

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