Merge
authormockner
Wed, 03 Feb 2016 19:46:45 +0100
changeset 35919 35abf02053d9
parent 35916 23189249c2c1 (diff)
parent 35918 1e48ea715a0b (current diff)
child 35921 3f909b955a05
Merge
--- a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp	Wed Feb 03 18:16:54 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp	Wed Feb 03 19:46:45 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,10 @@
     _monitor = DirtyCardQ_CBL_mon;
   }
   initialize();
-  create_and_start();
 
   // set name
   set_name("G1 Refine#%d", worker_id);
+  create_and_start();
 }
 
 void ConcurrentG1RefineThread::initialize() {
--- a/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp	Wed Feb 03 18:16:54 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp	Wed Feb 03 19:46:45 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,9 +61,8 @@
                          true,
                          Monitor::_safepoint_check_never);
 
+  set_name("G1 Young RemSet Sampling");
   create_and_start();
-
-  set_name("G1 Young RemSet Sampling");
 }
 
 void G1YoungRemSetSamplingThread::sleep_before_next_cycle() {