--- jsr166/src/jsr166e/LongAdder.java 2011/09/10 01:38:28 1.7 +++ jsr166/src/jsr166e/LongAdder.java 2013/01/07 07:14:01 1.13 @@ -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 @@ -19,7 +16,7 @@ import java.io.ObjectOutputStream; * #longValue}) returns the current total combined across the * variables maintaining the sum. * - *

This class is usually preferable to {@link AtomicLong} when + *

This class is usually preferable to {@link AtomicLong} when * multiple threads update a common sum that is used for purposes such * as collecting statistics, not for fine-grained synchronization * control. Under low update contention, the two classes have similar @@ -28,12 +25,12 @@ import java.io.ObjectOutputStream; * consumption. * *

This class extends {@link Number}, but does not define - * methods such as {@code hashCode} and {@code compareTo} because - * instances are expected to be mutated, and so are not useful as - * collection keys. + * methods such as {@code equals}, {@code hashCode} and {@code + * compareTo} because instances are expected to be mutated, and so are + * not useful as collection keys. * *

jsr166e note: This class is targeted to be placed in - * java.util.concurrent.atomic + * java.util.concurrent.atomic. * * @since 1.8 * @author Doug Lea @@ -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. @@ -146,7 +143,7 @@ public class LongAdder extends Striped64 /** * Returns the String representation of the {@link #sum}. - * @return the String representation of the {@link #sum}. + * @return the String representation of the {@link #sum} */ public String toString() { return Long.toString(sum()); @@ -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;