--- jsr166/src/jsr166e/DoubleMaxUpdater.java	2013/01/06 05:57:42	1.6
+++ jsr166/src/jsr166e/DoubleMaxUpdater.java	2014/05/04 22:38:19	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 double}
@@ -60,13 +57,13 @@ public class DoubleMaxUpdater extends St
      */
     public void update(double x) {
         long lx = Double.doubleToRawLongBits(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 ||
             (Double.longBitsToDouble(b = base) < x && !casBase(b, lx))) {
             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 ||
                 (Double.longBitsToDouble(v = a.value) < x &&
                  !(uncontended = a.cas(v, lx))))
                 retryUpdate(lx, hc, uncontended);
@@ -75,7 +72,7 @@ public class DoubleMaxUpdater extends St
 
     /**
      * 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.
@@ -185,8 +182,8 @@ public class DoubleMaxUpdater extends St
         s.writeDouble(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;