--- jsr166/src/jsr166e/CompletableFuture.java	2013/01/03 19:34:31	1.5
+++ jsr166/src/jsr166e/CompletableFuture.java	2013/02/16 16:53:34	1.13
@@ -388,7 +388,7 @@ public class CompletableFuture<T> implem
     }
 
     /** Base class can act as either FJ or plain Runnable */
-    static abstract class Async extends ForkJoinTask<Void>
+    abstract static class Async extends ForkJoinTask<Void>
         implements Runnable, AsynchronousCompletionTask {
         public final Void getRawResult() { return null; }
         public final void setRawResult(Void v) { }
@@ -557,7 +557,7 @@ public class CompletableFuture<T> implem
     }
 
     // Opportunistically subclass AtomicInteger to use compareAndSet to claim.
-    static abstract class Completion extends AtomicInteger implements Runnable {
+    abstract static class Completion extends AtomicInteger implements Runnable {
     }
 
     static final class ApplyCompletion<T,U> extends Completion {
@@ -1319,19 +1319,18 @@ public class CompletableFuture<T> implem
         Object r; Throwable ex, cause;
         if ((r = result) == null && (r = waitingGet(true)) == null)
             throw new InterruptedException();
-        if (r instanceof AltResult) {
-            if ((ex = ((AltResult)r).ex) != null) {
-                if (ex instanceof CancellationException)
-                    throw (CancellationException)ex;
-                if ((ex instanceof CompletionException) &&
-                    (cause = ex.getCause()) != null)
-                    ex = cause;
-                throw new ExecutionException(ex);
-            }
-            return null;
+        if (!(r instanceof AltResult)) {
+            @SuppressWarnings("unchecked") T tr = (T) r;
+            return tr;
         }
-        @SuppressWarnings("unchecked") T tr = (T) r;
-        return tr;
+        if ((ex = ((AltResult)r).ex) == null)
+            return null;
+        if (ex instanceof CancellationException)
+            throw (CancellationException)ex;
+        if ((ex instanceof CompletionException) &&
+            (cause = ex.getCause()) != null)
+            ex = cause;
+        throw new ExecutionException(ex);
     }
 
     /**
@@ -1356,19 +1355,18 @@ public class CompletableFuture<T> implem
             throw new InterruptedException();
         if ((r = result) == null)
             r = timedAwaitDone(nanos);
-        if (r instanceof AltResult) {
-            if ((ex = ((AltResult)r).ex) != null) {
-                if (ex instanceof CancellationException)
-                    throw (CancellationException)ex;
-                if ((ex instanceof CompletionException) &&
-                    (cause = ex.getCause()) != null)
-                    ex = cause;
-                throw new ExecutionException(ex);
-            }
-            return null;
+        if (!(r instanceof AltResult)) {
+            @SuppressWarnings("unchecked") T tr = (T) r;
+            return tr;
         }
-        @SuppressWarnings("unchecked") T tr = (T) r;
-        return tr;
+        if ((ex = ((AltResult)r).ex) == null)
+            return null;
+        if (ex instanceof CancellationException)
+            throw (CancellationException)ex;
+        if ((ex instanceof CompletionException) &&
+            (cause = ex.getCause()) != null)
+            ex = cause;
+        throw new ExecutionException(ex);
     }
 
     /**
@@ -1389,18 +1387,17 @@ public class CompletableFuture<T> implem
         Object r; Throwable ex;
         if ((r = result) == null)
             r = waitingGet(false);
-        if (r instanceof AltResult) {
-            if ((ex = ((AltResult)r).ex) != null) {
-                if (ex instanceof CancellationException)
-                    throw (CancellationException)ex;
-                if (ex instanceof CompletionException)
-                    throw (CompletionException)ex;
-                throw new CompletionException(ex);
-            }
-            return null;
+        if (!(r instanceof AltResult)) {
+            @SuppressWarnings("unchecked") T tr = (T) r;
+            return tr;
         }
-        @SuppressWarnings("unchecked") T tr = (T) r;
-        return tr;
+        if ((ex = ((AltResult)r).ex) == null)
+            return null;
+        if (ex instanceof CancellationException)
+            throw (CancellationException)ex;
+        if (ex instanceof CompletionException)
+            throw (CompletionException)ex;
+        throw new CompletionException(ex);
     }
 
     /**
@@ -1417,18 +1414,17 @@ public class CompletableFuture<T> implem
         Object r; Throwable ex;
         if ((r = result) == null)
             return valueIfAbsent;
-        if (r instanceof AltResult) {
-            if ((ex = ((AltResult)r).ex) != null) {
-                if (ex instanceof CancellationException)
-                    throw (CancellationException)ex;
-                if (ex instanceof CompletionException)
-                    throw (CompletionException)ex;
-                throw new CompletionException(ex);
-            }
-            return null;
+        if (!(r instanceof AltResult)) {
+            @SuppressWarnings("unchecked") T tr = (T) r;
+            return tr;
         }
-        @SuppressWarnings("unchecked") T tr = (T) r;
-        return tr;
+        if ((ex = ((AltResult)r).ex) == null)
+            return null;
+        if (ex instanceof CancellationException)
+            throw (CancellationException)ex;
+        if (ex instanceof CompletionException)
+            throw (CompletionException)ex;
+        throw new CompletionException(ex);
     }
 
     /**
@@ -2449,10 +2445,10 @@ public class CompletableFuture<T> implem
      * then the returned CompletableFuture also does so, with a
      * CompletionException holding this exception as its cause.
      *
-     * @param fn the function returning a new CompletableFuture.
+     * @param fn the function returning a new CompletableFuture
      * @return the CompletableFuture, that {@code isDone()} upon
      * return if completed by the given function, or an exception
-     * occurs.
+     * occurs
      */
     public <U> CompletableFuture<U> thenCompose(Fun<? super T,
                                                 CompletableFuture<U>> fn) {
@@ -2559,7 +2555,6 @@ public class CompletableFuture<T> implem
      *
      * @param fn the function to use to compute the value of the
      * returned CompletableFuture
-
      * @return the new CompletableFuture
      */
     public <U> CompletableFuture<U> handle(BiFun<? super T, Throwable, ? extends U> fn) {
@@ -2633,17 +2628,16 @@ public class CompletableFuture<T> implem
      */
     public boolean isCancelled() {
         Object r;
-        return ((r = result) != null &&
-                (r instanceof AltResult) &&
-                (((AltResult)r).ex instanceof CancellationException));
+        return ((r = result) instanceof AltResult) &&
+            (((AltResult)r).ex instanceof CancellationException);
     }
 
     /**
      * Forcibly sets or resets the value subsequently returned by
-     * method get() and related methods, whether or not already
-     * completed. This method is designed for use only in error
-     * recovery actions, and even in such situations may result in
-     * ongoing dependent completions using established versus
+     * method {@link #get()} and related methods, whether or not
+     * already completed. This method is designed for use only in
+     * error recovery actions, and even in such situations may result
+     * in ongoing dependent completions using established versus
      * overwritten outcomes.
      *
      * @param value the completion value
@@ -2654,9 +2648,9 @@ public class CompletableFuture<T> implem
     }
 
     /**
-     * Forcibly causes subsequent invocations of method get() and
-     * related methods to throw the given exception, whether or not
-     * already completed. This method is designed for use only in
+     * Forcibly causes subsequent invocations of method {@link #get()}
+     * and related methods to throw the given exception, whether or
+     * not already completed. This method is designed for use only in
      * recovery actions, and even in such situations may result in
      * ongoing dependent completions using established versus
      * overwritten outcomes.
@@ -2700,22 +2694,23 @@ public class CompletableFuture<T> implem
     private static sun.misc.Unsafe getUnsafe() {
         try {
             return sun.misc.Unsafe.getUnsafe();
-        } catch (SecurityException se) {
-            try {
-                return java.security.AccessController.doPrivileged
-                    (new java.security
-                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
-                        public sun.misc.Unsafe run() throws Exception {
-                            java.lang.reflect.Field f = sun.misc
-                                .Unsafe.class.getDeclaredField("theUnsafe");
-                            f.setAccessible(true);
-                            return (sun.misc.Unsafe) f.get(null);
-                        }});
-            } catch (java.security.PrivilegedActionException e) {
-                throw new RuntimeException("Could not initialize intrinsics",
-                                           e.getCause());
-            }
+        } catch (SecurityException tryReflectionInstead) {}
+        try {
+            return java.security.AccessController.doPrivileged
+            (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
+                public sun.misc.Unsafe run() throws Exception {
+                    Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
+                    for (java.lang.reflect.Field f : k.getDeclaredFields()) {
+                        f.setAccessible(true);
+                        Object x = f.get(null);
+                        if (k.isInstance(x))
+                            return k.cast(x);
+                    }
+                    throw new NoSuchFieldError("the Unsafe");
+                }});
+        } catch (java.security.PrivilegedActionException e) {
+            throw new RuntimeException("Could not initialize intrinsics",
+                                       e.getCause());
         }
     }
-
 }