comparison src/share/vm/memory/universe.cpp @ 6870:e52361627b65

Merge
author coleenp
date Mon, 15 Oct 2012 22:33:19 -0400
parents 5876f980ea19 bdb5f8c9978b
children 6bc207d87e5d 070d523b96a7
comparison
equal deleted inserted replaced
6861:58fbf2da3c16 6870:e52361627b65
1266 } 1266 }
1267 st->print_cr("}"); 1267 st->print_cr("}");
1268 } 1268 }
1269 1269
1270 void Universe::verify(bool silent, VerifyOption option) { 1270 void Universe::verify(bool silent, VerifyOption option) {
1271 if (SharedSkipVerify) {
1272 return;
1273 }
1274
1275 // The use of _verify_in_progress is a temporary work around for 1271 // The use of _verify_in_progress is a temporary work around for
1276 // 6320749. Don't bother with a creating a class to set and clear 1272 // 6320749. Don't bother with a creating a class to set and clear
1277 // it since it is only used in this method and the control flow is 1273 // it since it is only used in this method and the control flow is
1278 // straight forward. 1274 // straight forward.
1279 _verify_in_progress = true; 1275 _verify_in_progress = true;