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

Comparing jsr166/src/jsr166e/CompletableFuture.java (file contents):
Revision 1.5 by jsr166, Thu Jan 3 19:34:31 2013 UTC vs.
Revision 1.10 by jsr166, Wed Feb 6 07:07:48 2013 UTC

# Line 388 | Line 388 | public class CompletableFuture<T> implem
388      }
389  
390      /** Base class can act as either FJ or plain Runnable */
391 <    static abstract class Async extends ForkJoinTask<Void>
391 >    abstract static class Async extends ForkJoinTask<Void>
392          implements Runnable, AsynchronousCompletionTask {
393          public final Void getRawResult() { return null; }
394          public final void setRawResult(Void v) { }
# Line 557 | Line 557 | public class CompletableFuture<T> implem
557      }
558  
559      // Opportunistically subclass AtomicInteger to use compareAndSet to claim.
560 <    static abstract class Completion extends AtomicInteger implements Runnable {
560 >    abstract static class Completion extends AtomicInteger implements Runnable {
561      }
562  
563      static final class ApplyCompletion<T,U> extends Completion {
# Line 2449 | Line 2449 | public class CompletableFuture<T> implem
2449       * then the returned CompletableFuture also does so, with a
2450       * CompletionException holding this exception as its cause.
2451       *
2452 <     * @param fn the function returning a new CompletableFuture.
2452 >     * @param fn the function returning a new CompletableFuture
2453       * @return the CompletableFuture, that {@code isDone()} upon
2454       * return if completed by the given function, or an exception
2455 <     * occurs.
2455 >     * occurs
2456       */
2457      public <U> CompletableFuture<U> thenCompose(Fun<? super T,
2458                                                  CompletableFuture<U>> fn) {
# Line 2640 | Line 2640 | public class CompletableFuture<T> implem
2640  
2641      /**
2642       * Forcibly sets or resets the value subsequently returned by
2643 <     * method get() and related methods, whether or not already
2644 <     * completed. This method is designed for use only in error
2645 <     * recovery actions, and even in such situations may result in
2646 <     * ongoing dependent completions using established versus
2643 >     * method {@link #get()} and related methods, whether or not
2644 >     * already completed. This method is designed for use only in
2645 >     * error recovery actions, and even in such situations may result
2646 >     * in ongoing dependent completions using established versus
2647       * overwritten outcomes.
2648       *
2649       * @param value the completion value
# Line 2654 | Line 2654 | public class CompletableFuture<T> implem
2654      }
2655  
2656      /**
2657 <     * Forcibly causes subsequent invocations of method get() and
2658 <     * related methods to throw the given exception, whether or not
2659 <     * already completed. This method is designed for use only in
2657 >     * Forcibly causes subsequent invocations of method {@link #get()}
2658 >     * and related methods to throw the given exception, whether or
2659 >     * not already completed. This method is designed for use only in
2660       * recovery actions, and even in such situations may result in
2661       * ongoing dependent completions using established versus
2662       * overwritten outcomes.
# Line 2700 | Line 2700 | public class CompletableFuture<T> implem
2700      private static sun.misc.Unsafe getUnsafe() {
2701          try {
2702              return sun.misc.Unsafe.getUnsafe();
2703 <        } catch (SecurityException se) {
2704 <            try {
2705 <                return java.security.AccessController.doPrivileged
2706 <                    (new java.security
2707 <                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
2708 <                        public sun.misc.Unsafe run() throws Exception {
2709 <                            java.lang.reflect.Field f = sun.misc
2710 <                                .Unsafe.class.getDeclaredField("theUnsafe");
2711 <                            f.setAccessible(true);
2712 <                            return (sun.misc.Unsafe) f.get(null);
2713 <                        }});
2714 <            } catch (java.security.PrivilegedActionException e) {
2715 <                throw new RuntimeException("Could not initialize intrinsics",
2716 <                                           e.getCause());
2717 <            }
2703 >        } catch (SecurityException tryReflectionInstead) {}
2704 >        try {
2705 >            return java.security.AccessController.doPrivileged
2706 >            (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
2707 >                public sun.misc.Unsafe run() throws Exception {
2708 >                    Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
2709 >                    for (java.lang.reflect.Field f : k.getDeclaredFields()) {
2710 >                        f.setAccessible(true);
2711 >                        Object x = f.get(null);
2712 >                        if (k.isInstance(x))
2713 >                            return k.cast(x);
2714 >                    }
2715 >                    throw new NoSuchFieldError("the Unsafe");
2716 >                }});
2717 >        } catch (java.security.PrivilegedActionException e) {
2718 >            throw new RuntimeException("Could not initialize intrinsics",
2719 >                                       e.getCause());
2720          }
2721      }
2720 –
2722   }

Diff Legend

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