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.122 by jsr166, Fri May 30 02:00:58 2014 UTC vs.
Revision 1.123 by jsr166, Fri May 30 16:10:11 2014 UTC

#	Line 275 | Line 275 | public class CompletableFuture<T> implem
275		return t;
276		}
277
278	<	/* ------------- Async task preliminaries  -------------- */
278	>	/* ------------- Async task preliminaries -------------- */
279
280		/**
281		* A marker interface identifying asynchronous tasks produced by
#	Line 503 | Line 503 | public class CompletableFuture<T> implem
503		private <U> CompletableFuture<U> uniApplyStage(
504		Executor e, Function<? super T,? extends U> f) {
505		if (f == null) throw new NullPointerException();
506	<	CompletableFuture<U> d =  new CompletableFuture<U>();
506	>	CompletableFuture<U> d = new CompletableFuture<U>();
507		if (e != null || !d.uniApply(this, f, null)) {
508		UniApply<T,U> c = new UniApply<T,U>(e, d, this, f);
509		push(c);

Diff Legend

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