--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu May 29 14:31:28 2014 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Jun 04 14:16:20 2014 +0200
@@ -901,7 +901,7 @@
G1CollectedHeap* g1h = G1CollectedHeap::heap();
G1CollectorPolicy* g1p = g1h->g1_policy();
- clear_has_aborted();
+ _has_aborted = false;
#ifndef PRODUCT
if (G1PrintReachableAtInitialMark) {
@@ -3261,7 +3261,7 @@
}
_first_overflow_barrier_sync.abort();
_second_overflow_barrier_sync.abort();
- set_has_aborted();
+ _has_aborted = true;
SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
satb_mq_set.abandon_partial_marking();