--- old/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2015-02-27 15:19:10.234465589 +0100
+++ new/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2015-02-27 15:19:10.142465593 +0100
@@ -2121,26 +2121,19 @@
     _root_region_scan_wait.add(phase_times->root_region_scan_wait_time_ms());
     _parallel.add(phase_times->cur_collection_par_time_ms());
     _ext_root_scan.add(phase_times->average_time(G1GCPhaseTimes::ExtRootScan));
-    if (phase_times->enabled(G1GCPhaseTimes::SATBFiltering)) {
-      _satb_filtering.add(phase_times->average_time(G1GCPhaseTimes::SATBFiltering));
-    } else {
-      _satb_filtering.add(0.0);
-    }
+    _satb_filtering.add(phase_times->average_time(G1GCPhaseTimes::SATBFiltering));
     _update_rs.add(phase_times->average_time(G1GCPhaseTimes::UpdateRS));
     _scan_rs.add(phase_times->average_time(G1GCPhaseTimes::ScanRS));
     _obj_copy.add(phase_times->average_time(G1GCPhaseTimes::ObjCopy));
     _termination.add(phase_times->average_time(G1GCPhaseTimes::Termination));
 
     double parallel_known_time = phase_times->average_time(G1GCPhaseTimes::ExtRootScan) +
+      phase_times->average_time(G1GCPhaseTimes::SATBFiltering) +
       phase_times->average_time(G1GCPhaseTimes::UpdateRS) +
       phase_times->average_time(G1GCPhaseTimes::ScanRS) +
       phase_times->average_time(G1GCPhaseTimes::ObjCopy) +
       phase_times->average_time(G1GCPhaseTimes::Termination);
 
-    if (phase_times->enabled(G1GCPhaseTimes::SATBFiltering)) {
-      parallel_known_time += phase_times->average_time(G1GCPhaseTimes::SATBFiltering);
-    }
-
     double parallel_other_time = phase_times->cur_collection_par_time_ms() - parallel_known_time;
     _parallel_other.add(parallel_other_time);
     _clear_ct.add(phase_times->cur_clear_ct_time_ms());