src/share/vm/runtime/java.cpp

*** 498,510 ****
    // Hang forever on exit if we're reporting an error.
    if (ShowMessageBoxOnError && is_error_reported()) {
      os::infinite_sleep();
    }
  
-   // Stop any ongoing concurrent GC work
-   Universe::heap()->stop();
- 
    // Terminate watcher thread - must before disenrolling any periodic task
    if (PeriodicTask::num_tasks() > 0)
      WatcherThread::stop();
  
    // Print statistics gathered (profiling ...)
--- 498,507 ----
*** 515,528 ****
  
    // shut down the StatSampler task
    StatSampler::disengage();
    StatSampler::destroy();
  
!   // We do not need to explicitly stop concurrent GC threads because the
!   // JVM will be taken down at a safepoint when such threads are inactive --
!   // except for some concurrent G1 threads, see (comment in)
!   // Threads::destroy_vm().
  
    // Print GC/heap related information.
    if (PrintGCDetails) {
      Universe::print();
      AdaptiveSizePolicyOutput(0);
--- 512,523 ----
  
    // shut down the StatSampler task
    StatSampler::disengage();
    StatSampler::destroy();
  
!   // Stop concurrent GC threads
!   Universe::heap()->stop();
  
    // Print GC/heap related information.
    if (PrintGCDetails) {
      Universe::print();
      AdaptiveSizePolicyOutput(0);