Mercurial > hg > release > icedtea7-forest-2.6 > hotspot

changeset 6742:059e07856d09 icedtea-2.6.20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u241-b01
author andrew
date Mon, 14 Oct 2019 19:19:49 +0100
parents bce00f066c87 (current diff) ed489da2b429 (diff)
children 8145b03db545
files .hgtags src/share/vm/classfile/classLoaderDependencies.cpp
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 14 18:40:43 2019 +0100
+++ b/.hgtags	Mon Oct 14 19:19:49 2019 +0100
@@ -948,3 +948,6 @@
 a8f5a2d0d6a0d4f7501c0f6c1efe933532d4e627 jdk7u231-b01
 6774b8e70603686f6d1e8a6749aebf5f2112b97e icedtea-2.6.19
 6774b8e70603686f6d1e8a6749aebf5f2112b97e icedtea-2.6.20pre00
+a8f5a2d0d6a0d4f7501c0f6c1efe933532d4e627 jdk7u231-ga
+a8f5a2d0d6a0d4f7501c0f6c1efe933532d4e627 jdk7u241-b00
+c6a8482b1d38cb24fada6a4de0038a577f384cb7 jdk7u241-b01
--- a/src/share/vm/classfile/classLoaderDependencies.cpp	Wed Aug 14 18:40:43 2019 +0100
+++ b/src/share/vm/classfile/classLoaderDependencies.cpp	Mon Oct 14 19:19:49 2019 +0100
@@ -76,6 +76,7 @@
 
   // Must handle over GC points
   assert (last != NULL, "dependencies should be initialized");
+  objArrayHandle head_handle(THREAD, list_head);
   objArrayHandle last_handle(THREAD, last);
 
   // Create a new dependency node with fields for (class_loader, next)
@@ -86,7 +87,7 @@
   objArrayHandle new_dependency(THREAD, deps);
 
   // Add the dependency under lock
-  ClassLoaderDependencies::locked_add(objArrayHandle(THREAD, list_head),
+  ClassLoaderDependencies::locked_add(head_handle,
                                       last_handle,
                                       new_dependency,
                                       THREAD);