# HG changeset patch
# User jmasa
# Date 1261062159 28800
# Node ID cf9a9a50e763f4901901e74f94b5d26e0f387203
# Parent  27f9477e879b14e4fe694d1674392bd0db0909c2# Parent  6dc5471e0f66b2b5caa54d7e76afbc9bacd3686b
Merge

diff -r 6dc5471e0f66 -r cf9a9a50e763 src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
--- a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Tue Dec 15 17:19:40 2009 -0800
+++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Thu Dec 17 07:02:39 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");
 }