src/share/vm/runtime/vmThread.cpp

*** 238,248 ****
  }
  
  void VMThread::run() {
    assert(this == vm_thread(), "check");
  
-   this->initialize_thread_local_storage();
    this->initialize_named_thread();
    this->record_stack_base_and_size();
    // Notify_lock wait checks on active_handles() to rewait in
    // case of spurious wakeup, it should wait on the last
    // value set prior to the notify
--- 238,247 ----
*** 306,318 ****
      MutexLockerEx ml(_terminate_lock, Mutex::_no_safepoint_check_flag);
      _terminated = true;
      _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.
  
  }
--- 305,314 ----