1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Mar 27 17:22:06 2008 -0700
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Tue Apr 01 15:13:47 2008 +0400
1.3 @@ -999,7 +999,7 @@
1.4 DEBUG_ONLY(mark_bitmap_count = mark_bitmap_size = 0;)
1.5
1.6 // Increment the invocation count
1.7 - heap->increment_total_collections();
1.8 + heap->increment_total_collections(true);
1.9
1.10 // We need to track unique mark sweep invocations as well.
1.11 _total_invocations++;
1.12 @@ -1964,7 +1964,7 @@
1.13 assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
1.14 assert(ref_processor() != NULL, "Sanity");
1.15
1.16 - if (GC_locker::is_active()) {
1.17 + if (GC_locker::check_active_before_gc()) {
1.18 return;
1.19 }
1.20
