1.1 --- a/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Sat Jul 31 15:10:59 2010 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Mon Aug 02 12:51:43 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -37,7 +37,8 @@
1.11 _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
1.12 _oc->do_oop(p);
1.13 #if FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT
1.14 - _dcto_cl->incr_count();
1.15 + if (_dcto_cl != NULL)
1.16 + _dcto_cl->incr_count();
1.17 #endif
1.18 }
1.19 }
1.20 @@ -113,7 +114,10 @@
1.21 if (_g1->in_cset_fast_test(obj)) {
1.22 Prefetch::write(obj->mark_addr(), 0);
1.23 Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
1.24 +
1.25 + // Place on the references queue
1.26 _par_scan_state->push_on_queue(p);
1.27 }
1.28 }
1.29 }
1.30 +
