diff src/share/vm/runtime/java.cpp @ 17992:a45a4f5a9609

8044796: G1: Enable G1CollectedHeap::stop() Reviewed-by: brutisso, sjohanss
author pliden
date Fri, 13 Jun 2014 13:46:06 +0200
parents 1772223a25a2
children 52b4284cb496 833b0f92429a
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp	Fri Jun 13 17:07:39 2014 -0400
+++ b/src/share/vm/runtime/java.cpp	Fri Jun 13 13:46:06 2014 +0200
@@ -497,9 +497,6 @@
     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();
@@ -514,10 +511,8 @@
   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().
+  // Stop concurrent GC threads
+  Universe::heap()->stop();
 
   // Print GC/heap related information.
   if (PrintGCDetails) {