1.1 --- a/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinTask.java	Sat Mar 19 10:46:31 2016 +0100
     1.2 +++ b/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinTask.java	Sat Mar 19 13:15:11 2016 +0100
     1.3 @@ -37,17 +37,13 @@
     1.4  
     1.5  import java.io.Serializable;
     1.6  import java.util.Collection;
     1.7 -import java.util.Collections;
     1.8  import java.util.List;
     1.9  import java.util.RandomAccess;
    1.10 -import java.util.Map;
    1.11  import java.lang.ref.WeakReference;
    1.12  import java.lang.ref.ReferenceQueue;
    1.13  import java.util.concurrent.Callable;
    1.14  import java.util.concurrent.CancellationException;
    1.15  import java.util.concurrent.ExecutionException;
    1.16 -import java.util.concurrent.Executor;
    1.17 -import java.util.concurrent.ExecutorService;
    1.18  import java.util.concurrent.Future;
    1.19  import java.util.concurrent.RejectedExecutionException;
    1.20  import java.util.concurrent.RunnableFuture;
    1.21 @@ -1368,14 +1364,14 @@
    1.22      }
    1.23  
    1.24      // Unsafe mechanics
    1.25 -    private static final sun.misc.Unsafe UNSAFE;
    1.26 +    private static final Unsafe UNSAFE;
    1.27      private static final long statusOffset;
    1.28      static {
    1.29          exceptionTableLock = new ReentrantLock();
    1.30          exceptionTableRefQueue = new ReferenceQueue<Object>();
    1.31          exceptionTable = new ExceptionNode[EXCEPTION_MAP_CAPACITY];
    1.32          try {
    1.33 -            UNSAFE = sun.misc.Unsafe.getUnsafe();
    1.34 +            UNSAFE = Unsafe.getUnsafe();
    1.35              statusOffset = UNSAFE.objectFieldOffset
    1.36                  (ForkJoinTask.class.getDeclaredField("status"));
    1.37          } catch (Exception e) {