ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/ArrayDeque.java

Comparing jsr166/src/main/java/util/ArrayDeque.java (file contents):
Revision 1.64 by dl, Mon Feb 23 19:54:04 2015 UTC vs.
Revision 1.65 by jsr166, Sat Feb 28 20:35:47 2015 UTC

#	Line 251 | Line 251 | public class ArrayDeque<E> extends Abstr
251		@SuppressWarnings("unchecked")
252		E result = (E) elements[h];
253		// Element is null if deque empty
254	<	if (result == null)
255	<	return null;
256	<	elements[h] = null;     // Must null out slot
257	<	head = (h + 1) & (elements.length - 1);
254	>	if (result != null) {
255	>	elements[h] = null; // Must null out slot
256	>	head = (h + 1) & (elements.length - 1);
257	>	}
258		return result;
259		}
260
#	Line 262 | Line 262 | public class ArrayDeque<E> extends Abstr
262		int t = (tail - 1) & (elements.length - 1);
263		@SuppressWarnings("unchecked")
264		E result = (E) elements[t];
265	<	if (result == null)
266	<	return null;
267	<	elements[t] = null;
268	<	tail = t;
265	>	if (result != null) {
266	>	elements[t] = null;
267	>	tail = t;
268	>	}
269		return result;
270		}
271

Diff Legend

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