From 59d6e93af467b2cfeb1667e9cd7d33b4b0fa7436 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 5 Feb 2012 21:09:33 +0100
Subject: [PATCH] Making Akka more Android compliant :-)

---
 .../main/java/akka/jsr166y/ForkJoinTask.java  | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/akka-actor/src/main/java/akka/jsr166y/ForkJoinTask.java b/akka-actor/src/main/java/akka/jsr166y/ForkJoinTask.java
index 996d05e647..9fe2005698 100644
--- a/akka-actor/src/main/java/akka/jsr166y/ForkJoinTask.java
+++ b/akka-actor/src/main/java/akka/jsr166y/ForkJoinTask.java
@@ -5,6 +5,8 @@
  */
 
 package akka.jsr166y;
+import akka.util.Unsafe;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
@@ -1521,23 +1523,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @return a sun.misc.Unsafe
      */
     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());
-            }
-        }
+        return Unsafe.instance;
     }
 }