# HG changeset patch
# User apetrusenko
# Date 1253278937 25200
# Node ID de5e1b1e4f666ea9b4cd50dbc5c3a5f8b4906f01
# Parent  fc7f4f3df1b7f5d676cb81f4c2797bf8438334f8# Parent  d8368e0b378314092bb043f44ed143f950e044a9
Merge

diff -r fc7f4f3df1b7 -r de5e1b1e4f66 hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Mon Sep 14 11:45:03 2009 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Fri Sep 18 06:02:17 2009 -0700
@@ -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();