--- jsr166/src/jsr166y/ForkJoinTask.java	2009/07/21 00:15:13	1.10
+++ jsr166/src/jsr166y/ForkJoinTask.java	2009/07/22 01:36:51	1.12
@@ -107,6 +107,9 @@ import java.lang.reflect.*;
  * in general sensible to serialize tasks only before or after, but
  * not during execution. Serialization is not relied on during
  * execution itself.
+ *
+ * @since 1.7
+ * @author Doug Lea
  */
 public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
 
@@ -162,7 +165,7 @@ public abstract class ForkJoinTask<V> im
     }
 
     final boolean casStatus(int cmp, int val) {
-        return _unsafe.compareAndSwapInt(this, statusOffset, cmp, val);
+        return UNSAFE.compareAndSwapInt(this, statusOffset, cmp, val);
     }
 
     /**
@@ -170,7 +173,7 @@ public abstract class ForkJoinTask<V> im
      */
     static void rethrowException(Throwable ex) {
         if (ex != null)
-            _unsafe.throwException(ex);
+            UNSAFE.throwException(ex);
     }
 
     // Setting completion status
@@ -213,7 +216,7 @@ public abstract class ForkJoinTask<V> im
     final void setNormalCompletion() {
         // Try typical fast case -- single CAS, no signal, not already done.
         // Manually expand casStatus to improve chances of inlining it
-        if (!_unsafe.compareAndSwapInt(this, statusOffset, 0, NORMAL))
+        if (!UNSAFE.compareAndSwapInt(this, statusOffset, 0, NORMAL))
             setCompletion(NORMAL);
     }
 
@@ -1053,16 +1056,16 @@ public abstract class ForkJoinTask<V> im
 
     private static long fieldOffset(String fieldName)
             throws NoSuchFieldException {
-        return _unsafe.objectFieldOffset
+        return UNSAFE.objectFieldOffset
             (ForkJoinTask.class.getDeclaredField(fieldName));
     }
 
-    static final Unsafe _unsafe;
+    static final Unsafe UNSAFE;
     static final long statusOffset;
 
     static {
         try {
-            _unsafe = getUnsafe();
+            UNSAFE = getUnsafe();
             statusOffset = fieldOffset("status");
         } catch (Throwable e) {
             throw new RuntimeException("Could not initialize intrinsics", e);