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.35 by dl, Fri Feb 22 00:58:05 2013 UTC vs.
Revision 1.36 by dl, Mon Feb 25 17:59:40 2013 UTC

#	Line 14 | Line 14 | import java.util.Deque;
14		import java.util.Iterator;
15		import java.util.NoSuchElementException;
16		import java.util.Queue;
17	+	import java.util.Spliterators;
18		import java.util.Spliterator;
19		import java.util.stream.Stream;
20		import java.util.stream.Streams;
#	Line 1376 | Line 1377 | public class ConcurrentLinkedDeque<E>
1377		Node<E> p; int n;
1378		final ConcurrentLinkedDeque<E> q = this.queue;
1379		if (!exhausted && (n = batch + 1) > 0 && n <= MAX_BATCH &&
1380	<	((p = current) != null || (p = q.first()) != null)) {
1380	>	((p = current) != null || (p = q.first()) != null) &&
1381	>	p.next != null) {
1382		Object[] a = new Object[batch = n];
1383		int i = 0;
1384		do {
#	Line 1387 | Line 1389 | public class ConcurrentLinkedDeque<E>
1389		} while (p != null && i < n);
1390		if ((current = p) == null)
1391		exhausted = true;
1392	<	return Collections.arraySnapshotSpliterator
1392	>	return Spliterators.spliterator
1393		(a, 0, i, Spliterator.ORDERED | Spliterator.NONNULL |
1394		Spliterator.CONCURRENT);
1395		}
#	Line 1433 | Line 1435 | public class ConcurrentLinkedDeque<E>
1435		return false;
1436		}
1437
1438	+	public long estimateSize() { return Long.MAX_VALUE; }
1439	+
1440		public int characteristics() {
1441		return Spliterator.ORDERED | Spliterator.NONNULL |
1442		Spliterator.CONCURRENT;

Diff Legend

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