--- jsr166/src/jsr166y/LinkedTransferQueue.java	2009/07/20 22:26:03	1.18
+++ jsr166/src/jsr166y/LinkedTransferQueue.java	2009/07/21 18:11:44	1.20
@@ -765,6 +765,7 @@ public class LinkedTransferQueue<E> exte
     /**
      * Reconstitute the Queue instance from a stream (that is,
      * deserialize it).
+     *
      * @param s the stream
      */
     private void readObject(java.io.ObjectInputStream s)
@@ -784,11 +785,11 @@ public class LinkedTransferQueue<E> exte
     // Support for resetting head/tail while deserializing
     private void resetHeadAndTail() {
         QNode dummy = new QNode(null, false);
-        _unsafe.putObjectVolatile(this, headOffset,
+        UNSAFE.putObjectVolatile(this, headOffset,
                                   new PaddedAtomicReference<QNode>(dummy));
-        _unsafe.putObjectVolatile(this, tailOffset,
+        UNSAFE.putObjectVolatile(this, tailOffset,
                                   new PaddedAtomicReference<QNode>(dummy));
-        _unsafe.putObjectVolatile(this, cleanMeOffset,
+        UNSAFE.putObjectVolatile(this, cleanMeOffset,
                                   new PaddedAtomicReference<QNode>(null));
     }
 
@@ -818,17 +819,17 @@ public class LinkedTransferQueue<E> exte
 
     private static long fieldOffset(String fieldName)
             throws NoSuchFieldException {
-        return _unsafe.objectFieldOffset
+        return UNSAFE.objectFieldOffset
             (LinkedTransferQueue.class.getDeclaredField(fieldName));
     }
 
-    private static final Unsafe _unsafe;
+    private static final Unsafe UNSAFE;
     private static final long headOffset;
     private static final long tailOffset;
     private static final long cleanMeOffset;
     static {
         try {
-            _unsafe = getUnsafe();
+            UNSAFE = getUnsafe();
             headOffset = fieldOffset("head");
             tailOffset = fieldOffset("tail");
             cleanMeOffset = fieldOffset("cleanMe");