1.1 --- a/src/share/vm/runtime/arguments.cpp Thu Apr 04 21:15:43 2013 -0700 1.2 +++ b/src/share/vm/runtime/arguments.cpp Fri Apr 05 10:20:04 2013 -0700 1.3 @@ -2006,11 +2006,12 @@ 1.4 // than just disable the lock verification. This will be fixed under 1.5 // bug 4788986. 1.6 if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) { 1.7 - if (VerifyGCStartAt == 0) { 1.8 + if (VerifyDuringStartup) { 1.9 warning("Heap verification at start-up disabled " 1.10 "(due to current incompatibility with FLSVerifyAllHeapReferences)"); 1.11 - VerifyGCStartAt = 1; // Disable verification at start-up 1.12 + VerifyDuringStartup = false; // Disable verification at start-up 1.13 } 1.14 + 1.15 if (VerifyBeforeExit) { 1.16 warning("Heap verification at shutdown disabled " 1.17 "(due to current incompatibility with FLSVerifyAllHeapReferences)");