1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Wed Aug 04 13:03:23 2010 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Fri Aug 06 10:17:21 2010 -0700
1.3 @@ -62,13 +62,13 @@
1.4 HeapRegion* to = _g1->heap_region_containing(obj);
1.5 // The test below could be optimized by applying a bit op to to and from.
1.6 if (to != NULL && from != NULL && from != to) {
1.7 - // The _par_traversal_in_progress flag is true during the collection pause,
1.8 - // false during the evacuation failure handing. This should avoid a
1.9 + // The _traversal_in_progress flag is true during the collection pause,
1.10 + // false during the evacuation failure handling. This should avoid a
1.11 // potential loop if we were to add the card containing 'p' to the DCQS
1.12 // that's used to regenerate the remembered sets for the collection set,
1.13 // in the event of an evacuation failure, here. The UpdateRSImmediate
1.14 // closure will eventally call this routine.
1.15 - if (_par_traversal_in_progress &&
1.16 + if (_traversal_in_progress &&
1.17 to->in_collection_set() && !self_forwarded(obj)) {
1.18
1.19 assert(_cset_rs_update_cl[tid] != NULL, "should have been set already");
