--- jsr166/src/jsr166e/LongAdder.java 2013/01/06 18:50:00 1.12 +++ jsr166/src/jsr166e/LongAdder.java 2013/01/14 02:02:41 1.14 @@ -6,10 +6,7 @@ package jsr166e; import java.util.concurrent.atomic.AtomicLong; -import java.io.IOException; import java.io.Serializable; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; /** * One or more variables that together maintain an initially zero @@ -85,7 +82,7 @@ public class LongAdder extends Striped64 /** * Returns the current sum. The returned value is NOT an - * atomic snapshot: invocation in the absence of concurrent + * atomic snapshot; invocation in the absence of concurrent * updates returns an accurate result, but concurrent updates that * occur while the sum is being calculated might not be * incorporated. @@ -191,8 +188,8 @@ public class LongAdder extends Striped64 s.writeLong(sum()); } - 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;