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.105 by jsr166, Sat Dec 24 09:27:49 2016 UTC vs.
Revision 1.106 by jsr166, Sat Dec 24 09:45:16 2016 UTC

#	Line 1003 | Line 1003 | public class LinkedTransferQueue<E> exte
1003		Object[] a = new Object[n];
1004		int i = 0;
1005		do {
1006	<	Object e = p.item;
1007	<	if (e != p && (a[i] = e) != null)
1006	>	Object item = p.item;
1007	>	if (item != p && (a[i] = item) != null)
1008		++i;
1009		if (p == (p = p.next))
1010		p = firstDataNode();
#	Line 1030 | Line 1030 | public class LinkedTransferQueue<E> exte
1030		((p = current) != null || (p = firstDataNode()) != null)) {
1031		exhausted = true;
1032		do {
1033	<	Object e = p.item;
1034	<	if (e != null && e != p)
1035	<	action.accept((E)e);
1033	>	Object item = p.item;
1034	>	if (item != null && item != p)
1035	>	action.accept((E)item);
1036		if (p == (p = p.next))
1037		p = firstDataNode();
1038		} while (p != null && p.isData);
#	Line 1045 | Line 1045 | public class LinkedTransferQueue<E> exte
1045		if (action == null) throw new NullPointerException();
1046		if (!exhausted &&
1047		((p = current) != null || (p = firstDataNode()) != null)) {
1048	<	Object e;
1048	>	Object item;
1049		do {
1050	<	if ((e = p.item) == p)
1051	<	e = null;
1050	>	if ((item = p.item) == p)
1051	>	item = null;
1052		if (p == (p = p.next))
1053		p = firstDataNode();
1054	<	} while (e == null && p != null && p.isData);
1054	>	} while (item == null && p != null && p.isData);
1055		if ((current = p) == null)
1056		exhausted = true;
1057	<	if (e != null) {
1058	<	action.accept((E)e);
1057	>	if (item != null) {
1058	>	action.accept((E)item);
1059		return true;
1060		}
1061		}

Diff Legend

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