src/share/vm/gc/shared/concurrentGCThread.cpp

*** 49,59 ****
    }
  }
  
  void ConcurrentGCThread::initialize_in_thread() {
    this->record_stack_base_and_size();
-   this->initialize_thread_local_storage();
    this->initialize_named_thread();
    this->set_active_handles(JNIHandleBlock::allocate_block());
    // From this time Thread::current() should be working.
    assert(this == Thread::current(), "just checking");
  }
--- 49,58 ----
*** 72,84 ****
      MutexLockerEx mu(Terminator_lock,
                       Mutex::_no_safepoint_check_flag);
      _has_terminated = true;
      Terminator_lock->notify();
    }
- 
-   // Thread destructor usually does this..
-   ThreadLocalStorage::set_thread(NULL);
  }
  
  static void _sltLoop(JavaThread* thread, TRAPS) {
    SurrogateLockerThread* slt = (SurrogateLockerThread*)thread;
    slt->loop();
--- 71,80 ----