ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/LinkedTransferQueue.java

Comparing jsr166/src/jsr166y/LinkedTransferQueue.java (file contents):
Revision 1.88 by jsr166, Sat Jun 4 17:57:59 2011 UTC vs.
Revision 1.90 by jsr166, Tue Jun 21 20:07:32 2011 UTC

#	Line 598 | Line 598 | public class LinkedTransferQueue<E> exte
598		break;        // unless slack < 2
599		}
600		LockSupport.unpark(p.waiter);
601	<	return this.<E>cast(item);
601	>	return LinkedTransferQueue.<E>cast(item);
602		}
603		}
604		Node n = p.next;
#	Line 676 | Line 676 | public class LinkedTransferQueue<E> exte
676		if (item != e) {                  // matched
677		// assert item != s;
678		s.forgetContents();           // avoid garbage
679	<	return this.<E>cast(item);
679	>	return LinkedTransferQueue.<E>cast(item);
680		}
681		if ((w.isInterrupted() || (timed && nanos <= 0)) &&
682		s.casItem(e, s)) {        // cancel
#	Line 757 | Line 757 | public class LinkedTransferQueue<E> exte
757		Object item = p.item;
758		if (p.isData) {
759		if (item != null && item != p)
760	<	return this.<E>cast(item);
760	>	return LinkedTransferQueue.<E>cast(item);
761		}
762		else if (item == null)
763		return null;
#	Line 1134 | Line 1134 | public class LinkedTransferQueue<E> exte
1134		if (c == this)
1135		throw new IllegalArgumentException();
1136		int n = 0;
1137	<	E e;
1138	<	while ( (e = poll()) != null) {
1137	>	for (E e; (e = poll()) != null;) {
1138		c.add(e);
1139		++n;
1140		}
#	Line 1152 | Line 1151 | public class LinkedTransferQueue<E> exte
1151		if (c == this)
1152		throw new IllegalArgumentException();
1153		int n = 0;
1154	<	E e;
1156	<	while (n < maxElements && (e = poll()) != null) {
1154	>	for (E e; n < maxElements && (e = poll()) != null;) {
1155		c.add(e);
1156		++n;
1157		}

Diff Legend

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