changeset 4774:5283790fa36a

Merge
author asaha
date Mon, 05 Aug 2013 13:44:48 -0700
parents 2a71de92a52b a70c27cf8d8d
children 63efa616e54d
files .hgtags
diffstat 5 files changed, 39 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 05 11:51:57 2013 -0700
+++ b/.hgtags	Mon Aug 05 13:44:48 2013 -0700
@@ -557,9 +557,11 @@
 73863f836e343b4b8e3f018e5e8f7f1618529096 jdk7u25-b31
 dd9090ad552134cbb20d5dfc89f682f55e2570e9 jdk7u25-b33
 9af6a8fa6a557311bdf2fc124ae6adad59c9b78d jdk7u25-b34
+675a89fd4548389e3d54a29c6fe271d913e7eee6 hs24-b55
+13edc330a937d4323f38b6a59cc255b6d61c51dc jdk7u40-b36
+295528bfcdd10051f72572a26bfad2317b7de464 jdk7u40-b37
 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
 d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
 7f16aa9067386aeb3668336aa6cd63ef3dc4f44a jdk7u45-b04
-99cd2b514c4d785a783d81f8bf5a7cca9f75f769 jdk7u45-b05
-0000000000000000000000000000000000000000 jdk7u45-b05
+b4fe146b820b47d8b59bbb9dc9d43221436ed0ae jdk7u45-b05
--- a/THIRD_PARTY_README	Mon Aug 05 11:51:57 2013 -0700
+++ b/THIRD_PARTY_README	Mon Aug 05 13:44:48 2013 -0700
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
--- a/make/hotspot_version	Mon Aug 05 11:51:57 2013 -0700
+++ b/make/hotspot_version	Mon Aug 05 13:44:48 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=45
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/src/share/vm/runtime/thread.cpp	Mon Aug 05 11:51:57 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Mon Aug 05 13:44:48 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	Mon Aug 05 11:51:57 2013 -0700
+++ b/src/share/vm/trace/traceMacros.hpp	Mon Aug 05 13:44:48 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