--- jsr166/src/jsr166e/DoubleMaxUpdater.java 2014/05/04 22:38:19 1.10 +++ jsr166/src/jsr166e/DoubleMaxUpdater.java 2014/05/05 20:20:15 1.12 @@ -5,6 +5,10 @@ */ package jsr166e; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.Serializable; /** @@ -61,7 +65,7 @@ public class DoubleMaxUpdater extends St if ((as = cells) != null || (Double.longBitsToDouble(b = base) < x && !casBase(b, lx))) { boolean uncontended = true; - if ((hc = threadHashCode.get()) == 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 && @@ -176,14 +180,13 @@ public class DoubleMaxUpdater extends St return (float)max(); } - private void writeObject(java.io.ObjectOutputStream s) - throws java.io.IOException { + private void writeObject(ObjectOutputStream s) throws IOException { s.defaultWriteObject(); s.writeDouble(max()); } - private void readObject(java.io.ObjectInputStream s) - throws java.io.IOException, ClassNotFoundException { + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { s.defaultReadObject(); busy = 0; cells = null;