aboutsummaryrefslogtreecommitdiff
path: root/src/share/vm
diff options
context:
space:
mode:
authorkevinw <none@none>2014-04-02 18:40:52 +0200
committerkevinw <none@none>2014-04-02 18:40:52 +0200
commitc9cf42a04ea2897550643120355f52fa67986ec5 (patch)
tree3d5c3eea868864af95746df6be98318f3eb74d23 /src/share/vm
parentb36d5cebc4b83c5307be3149dc415893b4955c64 (diff)
8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction
Reviewed-by: dholmes, dsamersoff Contributed-by: andreas.eriksson@oracle.com
Diffstat (limited to 'src/share/vm')
-rw-r--r--src/share/vm/runtime/vmThread.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/share/vm/runtime/vmThread.cpp b/src/share/vm/runtime/vmThread.cpp
index bdb508208..a0a27d3ff 100644
--- a/src/share/vm/runtime/vmThread.cpp
+++ b/src/share/vm/runtime/vmThread.cpp
@@ -316,6 +316,9 @@ void VMThread::run() {
_terminate_lock->notify();
}
+ // Thread destructor usually does this.
+ ThreadLocalStorage::set_thread(NULL);
+
// Deletion must be done synchronously by the JNI DestroyJavaVM thread
// so that the VMThread deletion completes before the main thread frees
// up the CodeHeap.