--- jsr166/src/jsr166e/LongMaxUpdater.java	2013/01/06 18:50:00	1.6
+++ jsr166/src/jsr166e/LongMaxUpdater.java	2014/05/05 01:57:35	1.10
@@ -5,10 +5,7 @@
  */
 
 package jsr166e;
-import java.io.IOException;
 import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 
 /**
  * One or more variables that together maintain a running {@code long}
@@ -51,13 +48,13 @@ public class LongMaxUpdater extends Stri
      * @param x the value to update
      */
     public void update(long x) {
-        Cell[] as; long b, v; HashCode hc; Cell a; int n;
+        Cell[] as; long b, v; int[] hc; Cell a; int n;
         if ((as = cells) != null ||
             (b = base) < x && !casBase(b, x)) {
             boolean uncontended = true;
-            int h = (hc = threadHashCode.get()).code;
-            if (as == null || (n = as.length) < 1 ||
-                (a = as[(n - 1) & h]) == null ||
+            if ((hc = threadHashCode.get()) == null ||
+                as == null || (n = as.length) < 1 ||
+                (a = as[(n - 1) & hc[0]]) == null ||
                 ((v = a.value) < x && !(uncontended = a.cas(v, x))))
                 retryUpdate(x, hc, uncontended);
         }
@@ -65,7 +62,7 @@ public class LongMaxUpdater extends Stri
 
     /**
      * Returns the current maximum.  The returned value is
-     * <em>NOT</em> an atomic snapshot: invocation in the absence of
+     * <em>NOT</em> an atomic snapshot; invocation in the absence of
      * concurrent updates returns an accurate result, but concurrent
      * updates that occur while the value is being calculated might
      * not be incorporated.
@@ -175,8 +172,8 @@ public class LongMaxUpdater extends Stri
         s.writeLong(max());
     }
 
-    private void readObject(ObjectInputStream s)
-        throws IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream s)
+        throws java.io.IOException, ClassNotFoundException {
         s.defaultReadObject();
         busy = 0;
         cells = null;