--- old/src/share/vm/memory/genCollectedHeap.cpp	2011-09-14 14:54:27.396624951 -0700
+++ new/src/share/vm/memory/genCollectedHeap.cpp	2011-09-14 14:54:27.166473191 -0700
@@ -599,8 +599,7 @@
           // atomic wrt other collectors in this configuration, we
           // are guaranteed to have empty discovered ref lists.
           if (rp->discovery_is_atomic()) {
-            rp->verify_no_references_recorded();
-            rp->enable_discovery();
+            rp->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
             rp->setup_policy(do_clear_all_soft_refs);
           } else {
             // collect() below will enable discovery as appropriate