ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/Exchanger.java (file contents):
Revision 1.57 by jsr166, Fri Dec 23 20:48:39 2011 UTC vs.
Revision 1.58 by jsr166, Fri Dec 23 21:17:36 2011 UTC

#	Line 327 | Line 327 | public class Exchanger<V> {
327		*
328		* @param item the (nonnull) item to exchange
329		* @param timed true if the wait is timed
330	<	* @param ns if timed, the maximum wait time else 0L
330	>	* @param ns if timed, the maximum wait time, else 0L
331		* @return the other thread's item; or null if interrupted; or
332		* TIMED_OUT if timed and timed out
333		*/
#	Line 419 | Line 419 | public class Exchanger<V> {
419		*
420		* @param item the item to exchange
421		* @param timed true if the wait is timed
422	<	* @param ns if timed, the maximum wait time else 0L
422	>	* @param ns if timed, the maximum wait time, else 0L
423		* @return the other thread's item; or null if either the arena
424		* was enabled or the thread was interrupted before completion; or
425		* TIMED_OUT if timed and timed out

Diff Legend

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