# HG changeset patch # User acorn # Date 1253301290 14400 # Node ID 723131383de6394d94a5e0d32feed98bededcf95 # Parent 83c29a26f67c5ff56919a3e9f464655379599c12# Parent d7c9544cc141cac190db6ea1c65f7110dd219957 Merge diff -r 83c29a26f67c -r 723131383de6 src/share/vm/gc_implementation/g1/heapRegionSeq.cpp --- a/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp Wed Sep 16 15:42:46 2009 -0400 +++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp Fri Sep 18 15:14:50 2009 -0400 @@ -302,9 +302,9 @@ if (cur->isHumongous()) { return MemRegion(last_start, end); } - cur->reset_zero_fill(); assert(cur == _regions.top(), "Should be top"); if (!cur->is_empty()) break; + cur->reset_zero_fill(); shrink_bytes -= cur->capacity(); num_regions_deleted++; _regions.pop();