Merge
authorneliasso
Thu, 25 Feb 2016 11:17:33 +0100
changeset 36324 7f71620b8732
parent 36320 3d35d1e1dfde (diff)
parent 36323 f7d5ddfbb5ce (current diff)
child 36325 1330e79162ac
Merge
--- a/hotspot/src/share/vm/utilities/vmError.cpp	Thu Feb 25 10:44:51 2016 +0100
+++ b/hotspot/src/share/vm/utilities/vmError.cpp	Thu Feb 25 11:17:33 2016 +0100
@@ -1121,6 +1121,10 @@
   if (first_error_tid == -1 &&
       Atomic::cmpxchg_ptr(mytid, &first_error_tid, -1) == -1) {
 
+    // Initialize time stamps to use the same base.
+    out.time_stamp().update_to(1);
+    log.time_stamp().update_to(1);
+
     _id = id;
     _message = message;
     _thread = thread;