--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Tue Nov 24 04:46:04 2015 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Tue Nov 24 11:50:20 2015 +0000
@@ -162,7 +162,7 @@
* @since 1.7
* @author Doug Lea
*/
-@sun.misc.Contended
+@jdk.internal.vm.annotation.Contended
public class ForkJoinPool extends AbstractExecutorService {
/*
@@ -780,7 +780,7 @@
* arrays sharing cache lines. The @Contended annotation alerts
* JVMs to try to keep instances apart.
*/
- @sun.misc.Contended
+ @jdk.internal.vm.annotation.Contended
static final class WorkQueue {
/**
@@ -818,7 +818,7 @@
final ForkJoinWorkerThread owner; // owning thread or null if shared
volatile Thread parker; // == owner during call to park; else null
volatile ForkJoinTask<?> currentJoin; // task being joined in awaitJoin
- @sun.misc.Contended("group2") // separate from other fields
+ @jdk.internal.vm.annotation.Contended("group2") // separate from other fields
volatile ForkJoinTask<?> currentSteal; // nonnull when running some task
WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner) {