1.1 --- a/src/share/vm/runtime/thread.cpp Fri Sep 30 22:54:43 2011 -0700
1.2 +++ b/src/share/vm/runtime/thread.cpp Thu Oct 06 13:28:09 2011 -0400
1.3 @@ -753,8 +753,9 @@
1.4 jint thread_parity = _oops_do_parity;
1.5 if (thread_parity != strong_roots_parity) {
1.6 jint res = Atomic::cmpxchg(strong_roots_parity, &_oops_do_parity, thread_parity);
1.7 - if (res == thread_parity) return true;
1.8 - else {
1.9 + if (res == thread_parity) {
1.10 + return true;
1.11 + } else {
1.12 guarantee(res == strong_roots_parity, "Or else what?");
1.13 assert(SharedHeap::heap()->n_par_threads() > 0,
1.14 "Should only fail when parallel.");
1.15 @@ -3909,8 +3910,9 @@
1.16 }
1.17 }
1.18 VMThread* vmt = VMThread::vm_thread();
1.19 - if (vmt->claim_oops_do(is_par, cp))
1.20 + if (vmt->claim_oops_do(is_par, cp)) {
1.21 vmt->oops_do(f, cf);
1.22 + }
1.23 }
1.24
1.25 #ifndef SERIALGC
