changeset 4608:17ff5d08f85b

Merge
author ehelin
date Mon, 15 Apr 2013 08:17:40 -0700
parents 3cb217881b6c 7baf47cf4bed
children f438a35cc903
files
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	Tue Apr 02 19:17:14 2013 +0200
+++ b/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	Mon Apr 15 08:17:40 2013 -0700
@@ -145,19 +145,18 @@
 }
 
 bool VM_GC_HeapInspection::collect() {
-  CollectedHeap* ch = Universe::heap();
-  ch->ensure_parsability(false); // must happen, even if collection does
-                                 // not happen (e.g. due to GC_locker)
-
   if (GC_locker::is_active()) {
     return false;
   }
-  ch->collect_as_vm_thread(GCCause::_heap_inspection);
+  Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
   return true;
 }
 
 void VM_GC_HeapInspection::doit() {
   HandleMark hm;
+  Universe::heap()->ensure_parsability(false); // must happen, even if collection does
+                                               // not happen (e.g. due to GC_locker)
+                                               // or _full_gc being false
   if (_full_gc) {
     if (!collect()) {
       // The collection attempt was skipped because the gc locker is held.