summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
diff options
context:
space:
mode:
Diffstat (limited to 'luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java')
-rw-r--r--luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
index 63f46d6..eaf700c 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
@@ -1,13 +1,11 @@
/*
* Written by Doug Lea with assistance from members of JCP JSR-166
* Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
*/
package java.util.concurrent.atomic;
-import sun.misc.Unsafe;
-
/**
* An {@code AtomicMarkableReference} maintains an object reference
* along with a mark bit, that can be updated atomically.
@@ -163,7 +161,7 @@ public class AtomicMarkableReference<V> {
// Unsafe mechanics
- private static final sun.misc.Unsafe UNSAFE = UnsafeAccess.THE_ONE; // android-changed
+ private static final sun.misc.Unsafe UNSAFE = sun.misc.Unsafe.getUnsafe();
private static final long pairOffset =
objectFieldOffset(UNSAFE, "pair", AtomicMarkableReference.class);