changeset 4908:675a89fd4548 hs24-b55

Merge
author amurillo
date Fri, 26 Jul 2013 12:05:47 -0700
parents cf4d5e8cadf6 bf3070e2ed2c
children 350bd7589660
files make/hotspot_version
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Wed Jul 24 18:58:03 2013 -0700
+++ b/make/hotspot_version	Fri Jul 26 12:05:47 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=54
+HS_BUILD_NUMBER=55
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/src/share/vm/runtime/thread.cpp	Wed Jul 24 18:58:03 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Fri Jul 26 12:05:47 2013 -0700
@@ -332,6 +332,8 @@
   // Reclaim the objectmonitors from the omFreeList of the moribund thread.
   ObjectSynchronizer::omFlush (this) ;
 
+  THREAD_EXIT(this);
+
   // stack_base can be NULL if the thread is never started or exited before
   // record_stack_base_and_size called. Although, we would like to ensure
   // that all started threads do call record_stack_base_and_size(), there is
--- a/src/share/vm/trace/traceMacros.hpp	Wed Jul 24 18:58:03 2013 -0700
+++ b/src/share/vm/trace/traceMacros.hpp	Fri Jul 26 12:05:47 2013 -0700
@@ -26,6 +26,7 @@
 #define SHARE_VM_TRACE_TRACE_MACRO_HPP
 
 #define EVENT_THREAD_EXIT(thread)
+#define THREAD_EXIT(thread)
 
 #define TRACE_INIT_ID(k)
 #define TRACE_DATA TraceThreadData