ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentLinkedDeque.java (file contents):
Revision 1.37 by dl, Tue Feb 26 12:15:07 2013 UTC vs.
Revision 1.38 by dl, Wed Mar 13 12:39:01 2013 UTC

#	Line 1380 | Line 1380 | public class ConcurrentLinkedDeque<E>
1380		((p = current) != null || (p = q.first()) != null)) {
1381		if (p.item == null && p == (p = p.next))
1382		current = p = q.first();
1383	<	if (p.next != null) {
1383	>	if (p != null && p.next != null) {
1384		Object[] a = new Object[batch = n];
1385		int i = 0;
1386		do {
#	Line 1446 | Line 1446 | public class ConcurrentLinkedDeque<E>
1446		}
1447		}
1448
1449	<	Spliterator<E> spliterator() {
1449	>	public Spliterator<E> spliterator() {
1450		return new CLDSpliterator<E>(this);
1451		}
1452
1453	–	public Stream<E> stream() {
1454	–	return Streams.stream(spliterator());
1455	–	}
1456	–
1457	–	public Stream<E> parallelStream() {
1458	–	return Streams.parallelStream(spliterator());
1459	–	}
1460	–
1453		/**
1454		* Saves this deque to a stream (that is, serializes it).
1455		*

Diff Legend

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