# HG changeset patch
# User jmasa
# Date 1260552648 28800
# Node ID 27f9477e879b14e4fe694d1674392bd0db0909c2
# Parent  84a2da7f454c3b393673681a19ac51829001b045# Parent  9dc2adf2cbe0f55fd7e52a85e545b29a21308b86
Merge

diff -r 84a2da7f454c -r 27f9477e879b src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
--- a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Fri Dec 11 08:39:30 2009 -0800
+++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Fri Dec 11 09:30:48 2009 -0800
@@ -351,9 +351,16 @@
 CollectionSetChooser::printSortedHeapRegions() {
   gclog_or_tty->print_cr("Printing %d Heap Regions sorted by amount of known garbage",
                 _numMarkedRegions);
+
+  DEBUG_ONLY(int marked_count = 0;)
   for (int i = 0; i < _markedRegions.length(); i++) {
-    printHeapRegion(_markedRegions.at(i));
+    HeapRegion* r = _markedRegions.at(i);
+    if (r != NULL) {
+      printHeapRegion(r);
+      DEBUG_ONLY(marked_count++;)
+    }
   }
+  assert(marked_count == _numMarkedRegions, "must be");
   gclog_or_tty->print_cr("Done sorted heap region print");
 }