--- old/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp 2015-11-04 23:05:18.721762232 -0500 +++ new/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp 2015-11-04 23:05:17.137672962 -0500 @@ -144,9 +144,6 @@ _cmst = NULL; Terminator_lock->notify(); } - - // Thread destructor usually does this.. - ThreadLocalStorage::set_thread(NULL); } #ifndef PRODUCT