--- jsr166/src/jsr166e/extra/AtomicDouble.java 2011/10/19 23:01:30 1.7 +++ jsr166/src/jsr166e/extra/AtomicDouble.java 2013/03/04 15:21:23 1.16 @@ -19,13 +19,13 @@ import static java.lang.Double.longBitsT * this class does extend {@code Number} to allow uniform access by * tools and utilities that deal with numerically-based classes. * - *
This class compares primitive {@code double}
+ * This class compares primitive {@code double}
* values in methods such as {@link #compareAndSet} by comparing their
* bitwise representation using {@link Double#doubleToRawLongBits},
* which differs from both the primitive double {@code ==} operator
* and from {@link Double#equals}, as if implemented by:
* May fail spuriously
+ * May
+ * fail spuriously
* and does not provide ordering guarantees, so is only rarely an
* appropriate alternative to {@code compareAndSet}.
*
@@ -180,7 +184,7 @@ public class AtomicDouble extends Number
* after a narrowing primitive conversion.
*/
public int intValue() {
- return (int)get();
+ return (int) get();
}
/**
@@ -188,7 +192,7 @@ public class AtomicDouble extends Number
* after a narrowing primitive conversion.
*/
public long longValue() {
- return (long)get();
+ return (long) get();
}
/**
@@ -196,7 +200,7 @@ public class AtomicDouble extends Number
* after a narrowing primitive conversion.
*/
public float floatValue() {
- return (float)get();
+ return (float) get();
}
/**
@@ -206,6 +210,28 @@ public class AtomicDouble extends Number
return get();
}
+ /**
+ * Saves the state to a stream (that is, serializes it).
+ *
+ * @serialData The current value is emitted (a {@code double}).
+ */
+ private void writeObject(java.io.ObjectOutputStream s)
+ throws java.io.IOException {
+ s.defaultWriteObject();
+
+ s.writeDouble(get());
+ }
+
+ /**
+ * Reconstitutes the instance from a stream (that is, deserializes it).
+ */
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+
+ set(s.readDouble());
+ }
+
// Unsafe mechanics
private static final sun.misc.Unsafe unsafe = getUnsafe();
private static final long valueOffset;
@@ -227,21 +253,23 @@ public class AtomicDouble extends Number
private static sun.misc.Unsafe getUnsafe() {
try {
return sun.misc.Unsafe.getUnsafe();
- } catch (SecurityException se) {
- try {
- return java.security.AccessController.doPrivileged
- (new java.security
- .PrivilegedExceptionAction {@code
- * boolean bitEquals(double x, double y) {
+ * static boolean bitEquals(double x, double y) {
* long xBits = Double.doubleToRawLongBits(x);
* long yBits = Double.doubleToRawLongBits(y);
* return xBits == yBits;
@@ -38,9 +38,9 @@ import static java.lang.Double.longBitsT
* @author Martin Buchholz
*/
public class AtomicDouble extends Number implements java.io.Serializable {
- static final long serialVersionUID = -8405198993435143622L;
+ private static final long serialVersionUID = -8405198993435143622L;
- private volatile long value;
+ private transient volatile long value;
/**
* Creates a new {@code AtomicDouble} with the given initial value.
@@ -54,7 +54,9 @@ public class AtomicDouble extends Number
/**
* Creates a new {@code AtomicDouble} with initial value {@code 0.0}.
*/
- public AtomicDouble() { this(0.0); }
+ public AtomicDouble() {
+ // assert doubleToRawLongBits(0.0) == 0L;
+ }
/**
* Gets the current value.
@@ -121,7 +123,9 @@ public class AtomicDouble extends Number
* if the current value is bitwise equal
* to the expected value.
*
- *