1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp Tue Feb 16 14:11:44 2010 -0800 1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp Tue Feb 23 23:13:23 2010 -0500 1.3 @@ -467,7 +467,7 @@ 1.4 // and they are causing failures. When we resolve said race 1.5 // conditions, we'll revert back to parallel remembered set 1.6 // updating and scanning. See CRs 6677707 and 6677708. 1.7 - if (G1ParallelRSetUpdatingEnabled || (worker_i == 0)) { 1.8 + if (G1UseParallelRSetUpdating || (worker_i == 0)) { 1.9 updateRS(worker_i); 1.10 scanNewRefsRS(oc, worker_i); 1.11 } else { 1.12 @@ -476,7 +476,7 @@ 1.13 _g1p->record_update_rs_time(worker_i, 0.0); 1.14 _g1p->record_scan_new_refs_time(worker_i, 0.0); 1.15 } 1.16 - if (G1ParallelRSetScanningEnabled || (worker_i == 0)) { 1.17 + if (G1UseParallelRSetScanning || (worker_i == 0)) { 1.18 scanRS(oc, worker_i); 1.19 } else { 1.20 _g1p->record_scan_rs_start_time(worker_i, os::elapsedTime() * 1000.0);