diff -r b2bbfc960e8f -r 1b277b5ee6e3 hotspot/test/runtime/contended/OopMaps.java --- a/hotspot/test/runtime/contended/OopMaps.java Tue Nov 24 09:02:26 2015 +0000 +++ b/hotspot/test/runtime/contended/OopMaps.java Tue Nov 24 11:49:44 2015 +0000 @@ -36,7 +36,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import sun.misc.Unsafe; -import sun.misc.Contended; +import jdk.internal.vm.annotation.Contended; /* * @test