ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/CompletableFuture.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.213 by dl, Mon Sep 17 11:50:12 2018 UTC vs.
Revision 1.214 by jsr166, Mon Sep 17 14:18:15 2018 UTC

# Line 979 | Line 979 | public class CompletableFuture<T> implem
979              } catch (Throwable ex) {
980                  d.result = encodeThrowable(ex);
981              }
982 <        }        
982 >        }
983          return d;
984      }
985  
# Line 993 | Line 993 | public class CompletableFuture<T> implem
993          }
994          final CompletableFuture<T> tryFire(int mode) {
995              CompletableFuture<T> d; CompletableFuture<T> a;
996 <            Function<Throwable, ? extends CompletionStage<T>> f;            
996 >            Function<Throwable, ? extends CompletionStage<T>> f;
997              Object r; Throwable x;
998              if ((d = dep) == null || (f = fn) == null
999                  || (a = src) == null || (r = a.result) == null)
# Line 1056 | Line 1056 | public class CompletableFuture<T> implem
1056          return d;
1057      }
1058  
1059 <    
1059 >
1060      @SuppressWarnings("serial")
1061      static final class UniRelay<U, T extends U> extends UniCompletion<T,U> {
1062          UniRelay(CompletableFuture<U> dep, CompletableFuture<T> src) {
# Line 2353 | Line 2353 | public class CompletableFuture<T> implem
2353          return uniExceptionallyStage(screenExecutor(executor), fn);
2354      }
2355  
2356 <     public CompletableFuture<T> exceptionallyCompose(
2356 >    public CompletableFuture<T> exceptionallyCompose(
2357          Function<Throwable, ? extends CompletionStage<T>> fn) {
2358          return uniComposeExceptionallyStage(null, fn);
2359      }
# Line 2368 | Line 2368 | public class CompletableFuture<T> implem
2368          Executor executor) {
2369          return uniComposeExceptionallyStage(screenExecutor(executor), fn);
2370      }
2371 <    
2371 >
2372      /* ------------- Arbitrary-arity constructions -------------- */
2373  
2374      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines