--- jsr166/src/jsr166y/Phaser.java	2009/07/23 23:07:57	1.18
+++ jsr166/src/jsr166y/Phaser.java	2009/07/24 23:47:01	1.19
@@ -9,8 +9,6 @@ package jsr166y;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.LockSupport;
-import sun.misc.Unsafe;
-import java.lang.reflect.*;
 
 /**
  * A reusable synchronization barrier, similar in functionality to a
@@ -931,48 +929,47 @@ public class Phaser {
         return p;
     }
 
-    // Temporary Unsafe mechanics for preliminary release
-    private static Unsafe getUnsafe() throws Throwable {
+    // Unsafe mechanics for jsr166y 3rd party package.
+    private static sun.misc.Unsafe getUnsafe() {
         try {
-            return Unsafe.getUnsafe();
+            return sun.misc.Unsafe.getUnsafe();
         } catch (SecurityException se) {
             try {
                 return java.security.AccessController.doPrivileged
-                    (new java.security.PrivilegedExceptionAction<Unsafe>() {
-                        public Unsafe run() throws Exception {
-                            return getUnsafePrivileged();
+                    (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
+                        public sun.misc.Unsafe run() throws Exception {
+                            return getUnsafeByReflection();
                         }});
             } catch (java.security.PrivilegedActionException e) {
-                throw e.getCause();
+                throw new RuntimeException("Could not initialize intrinsics",
+                                           e.getCause());
             }
         }
     }
 
-    private static Unsafe getUnsafePrivileged()
+    private static sun.misc.Unsafe getUnsafeByReflection()
             throws NoSuchFieldException, IllegalAccessException {
-        Field f = Unsafe.class.getDeclaredField("theUnsafe");
+        java.lang.reflect.Field f =
+            sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
         f.setAccessible(true);
-        return (Unsafe) f.get(null);
+        return (sun.misc.Unsafe) f.get(null);
     }
 
-    private static long fieldOffset(String fieldName)
-            throws NoSuchFieldException {
-        return UNSAFE.objectFieldOffset
-            (Phaser.class.getDeclaredField(fieldName));
-    }
-
-    static final Unsafe UNSAFE;
-    static final long stateOffset;
-
-    static {
+    private static long fieldOffset(String fieldName, Class<?> klazz) {
         try {
-            UNSAFE = getUnsafe();
-            stateOffset = fieldOffset("state");
-        } catch (Throwable e) {
-            throw new RuntimeException("Could not initialize intrinsics", e);
+            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(fieldName));
+        } catch (NoSuchFieldException e) {
+            // Convert Exception to Error
+            NoSuchFieldError error = new NoSuchFieldError(fieldName);
+            error.initCause(e);
+            throw error;
         }
     }
 
+    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
+    static final long stateOffset =
+        fieldOffset("state", Phaser.class);
+
     final boolean casState(long cmp, long val) {
         return UNSAFE.compareAndSwapLong(this, stateOffset, cmp, val);
     }