src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp

rev 6671 : imported patch bengt-fixes

@@ -1043,17 +1043,10 @@
         _recent_avg_pause_time_ratio = 1.0;
       }
     }
   }
 
-  bool new_in_marking_window = _in_marking_window;
-  bool new_in_marking_window_im = false;
-  if (during_initial_mark_pause()) {
-    new_in_marking_window = true;
-    new_in_marking_window_im = true;
-  }
-
   if (_last_young_gc) {
     // This is supposed to to be the "last young GC" before we start
     // doing mixed GCs. Here we decide whether to start mixed GCs or not.
 
     if (!last_pause_included_initial_mark) {

@@ -1177,12 +1170,16 @@
 
     _pending_cards_seq->add((double) _pending_cards);
     _rs_lengths_seq->add((double) _max_rs_lengths);
   }
 
-  _in_marking_window = new_in_marking_window;
-  _in_marking_window_im = new_in_marking_window_im;
+  _in_marking_window_im = false;
+  if (last_pause_included_initial_mark) {
+    _in_marking_window = true;
+    _in_marking_window_im = true;
+  }
+
   _free_regions_at_end_of_collection = _g1->free_regions();
   update_young_list_target_length();
 
   // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
   double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;