ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.30 by dl, Wed Jan 2 18:20:22 2013 UTC vs.
Revision 1.31 by jsr166, Thu Jan 3 07:01:50 2013 UTC

#	Line 277 | Line 277 | public class CompletableFuture<T> implem
277		else if (q.thread != null && result == null) {
278		try {
279		ForkJoinPool.managedBlock(q);
280	<	} catch(InterruptedException ex){
280	>	} catch (InterruptedException ex) {
281		q.interruptControl = -1;
282		}
283		}
#	Line 310 | Line 310 | public class CompletableFuture<T> implem
310		if (nanos <= 0L)
311		throw new TimeoutException();
312		long d = System.nanoTime() + nanos;
313	<	q = new WaitNode(true, nanos, d == 0L? 1L : d); // avoid 0
313	>	q = new WaitNode(true, nanos, d == 0L ? 1L : d); // avoid 0
314		}
315		else if (!queued)
316		queued = UNSAFE.compareAndSwapObject(this, WAITERS,
#	Line 328 | Line 328 | public class CompletableFuture<T> implem
328		else if (q.thread != null && result == null) {
329		try {
330		ForkJoinPool.managedBlock(q);
331	<	} catch(InterruptedException ex){
331	>	} catch (InterruptedException ex) {
332		q.interruptControl = -1;
333		}
334		}

Diff Legend

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