ViewVC Help

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

root/jsr166/jsr166/src/jsr166x/LinkedBlockingDeque.java

Comparing jsr166/src/jsr166x/LinkedBlockingDeque.java (file contents):
Revision 1.4 by jsr166, Tue Nov 24 03:57:04 2009 UTC vs.
Revision 1.8 by jsr166, Tue Oct 25 18:46:37 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7		package jsr166x;
#	Line 524 | Line 524 | public class LinkedBlockingDeque<E>
524		* Variant of removeFirstOccurrence needed by iterator.remove.
525		* Searches for the node, not its contents.
526		*/
527	<	boolean removeNode(Node<E> e) {
527	>	boolean removeNode(Node<E> e) {
528		lock.lock();
529		try {
530		for (Node<E> p = first; p != null; p = p.next) {
#	Line 684 | Line 684 | public class LinkedBlockingDeque<E>
684		final ReentrantLock lock = LinkedBlockingDeque.this.lock;
685		lock.lock();
686		try {
687	<	next = (next == null)? first : next.next;
688	<	nextItem = (next == null)? null : next.item;
687	>	next = (next == null) ? first : next.next;
688	>	nextItem = (next == null) ? null : next.item;
689		} finally {
690		lock.unlock();
691		}
#	Line 717 | Line 717 | public class LinkedBlockingDeque<E>
717		}
718
719		/**
720	<	* Save the state to a stream (that is, serialize it).
720	>	* Saves the state to a stream (that is, serializes it).
721		*
722		* @serialData The capacity (int), followed by elements (each an
723		* <tt>Object</tt>) in the proper order, followed by a null
#	Line 740 | Line 740 | public class LinkedBlockingDeque<E>
740		}
741
742		/**
743	<	* Reconstitute this deque instance from a stream (that is,
744	<	* deserialize it).
743	>	* Reconstitutes this deque instance from a stream (that is,
744	>	* deserializes it).
745		* @param s the stream
746		*/
747		private void readObject(java.io.ObjectInputStream s)

Diff Legend

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