--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu Oct 21 17:29:24 2010 -0700
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Sat Oct 23 23:03:49 2010 -0700
@@ -659,9 +659,6 @@
}
return result; // could be null if we are out of space
} else if (!gch->incremental_collection_will_fail()) {
- // The gc_prologues have not executed yet. The value
- // for incremental_collection_will_fail() is the remanent
- // of the last collection.
// Do an incremental collection.
gch->do_collection(false /* full */,
false /* clear_all_soft_refs */,
@@ -739,9 +736,8 @@
GenCollectedHeap* gch = GenCollectedHeap::heap();
size_t gen0_capacity = gch->get_gen(0)->capacity_before_gc();
return (word_size > heap_word_size(gen0_capacity))
- || (GC_locker::is_active_and_needs_gc())
- || ( gch->last_incremental_collection_failed()
- && gch->incremental_collection_will_fail());
+ || GC_locker::is_active_and_needs_gc()
+ || gch->incremental_collection_failed();
}