--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:27:31.832335303 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:27:31.740335307 +0200
@@ -1854,8 +1854,7 @@
     = new G1SATBCardTableLoggingModRefBS(reserved_region());
   bs->initialize();
   assert(bs->is_a(BarrierSet::G1SATBCTLogging), "sanity");
-  _barrier_set = bs;
-  oopDesc::set_bs(bs);
+  set_barrier_set(bs);
 
   // Also create a G1 rem set.
   _g1_rem_set = new G1RemSet(this, g1_barrier_set());