# HG changeset patch
# User apetrusenko
# Date 1240860837 25200
# Node ID 4753e4079a5a59980e9755a4bf96a1d565b509d9
# Parent  6ffcd0923239378f24502b94b9c9ee298705dc36# Parent  2b6c55e3614354b21820406f2e15f486392e324d
Merge

diff -r 6ffcd0923239 -r 4753e4079a5a src/share/vm/gc_implementation/g1/g1_globals.hpp
--- a/src/share/vm/gc_implementation/g1/g1_globals.hpp	Fri Apr 24 18:45:14 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp	Mon Apr 27 12:33:57 2009 -0700
@@ -71,7 +71,7 @@
   develop(intx, G1MarkingVerboseLevel, 0,                                   \
           "Level (0-4) of verboseness of the marking code")                 \
                                                                             \
-  develop(bool, G1VerifyConcMarkPrintReachable, true,                       \
+  develop(bool, G1VerifyConcMarkPrintReachable, false,                      \
           "If conc mark verification fails, print reachable objects")       \
                                                                             \
   develop(bool, G1TraceMarkStackOverflow, false,                            \
diff -r 6ffcd0923239 -r 4753e4079a5a src/share/vm/gc_implementation/g1/heapRegion.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegion.cpp	Fri Apr 24 18:45:14 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp	Mon Apr 27 12:33:57 2009 -0700
@@ -718,7 +718,7 @@
       vl_cl.failures()) {
     g1->concurrent_mark()->print_prev_bitmap_reachable();
   }
-  guarantee(!vl_cl.failures(), "should not have had any failures");
+  guarantee(!vl_cl.failures(), "region verification failed");
   guarantee(p == top(), "end of last object must match end of space");
 }