--- old/src/share/vm/prims/jvmtiEnter.xsl 2015-11-19 01:02:27.997592105 -0500
+++ new/src/share/vm/prims/jvmtiEnter.xsl 2015-11-19 01:02:26.453505228 -0500
@@ -494,7 +494,7 @@
}
- Thread* this_thread = (Thread*)ThreadLocalStorage::thread();
+ Thread* this_thread = Thread::current_or_null();
@@ -528,7 +528,7 @@
return JVMTI_ERROR_WRONG_PHASE;
}
- Thread* this_thread = (Thread*)ThreadLocalStorage::thread();
+ Thread* this_thread = Thread::current_or_null();
@@ -558,7 +558,7 @@
if (Threads::number_of_threads() != 0) {
- Thread* this_thread = (Thread*)ThreadLocalStorage::thread();
+ Thread* this_thread = Thread::current_or_null();
@@ -567,7 +567,7 @@
if (Threads::number_of_threads() == 0) {
transition = false;
} else {
- this_thread = (Thread*)ThreadLocalStorage::thread();
+ this_thread = Thread::current_or_null();
transition = ((this_thread != NULL) && !this_thread->is_VM_thread() && !this_thread->is_ConcurrentGC_thread());
}
if (transition) {