/hg/icedtea6: Backport of S4465490: Suspicious about double-chec...

[ptisnovs at icedtea.classpath.org]

changeset 54ceda20a02c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=54ceda20a02c
author: ptisnovs
date: Mon Feb 27 14:40:52 2012 +0100

	Backport of S4465490: Suspicious about double-check locking idiom
	being used in the code.


diffstat:

 ChangeLog                                                           |   8 ++++
 Makefile.am                                                         |   3 +-
 NEWS                                                                |   1 +
 patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch |  20 ++++++++++
 4 files changed, 31 insertions(+), 1 deletions(-)

diffs (64 lines):

diff -r 44f51ec924fa -r 54ceda20a02c ChangeLog
--- a/ChangeLog	Mon Feb 27 11:50:34 2012 +0100
+++ b/ChangeLog	Mon Feb 27 14:40:52 2012 +0100
@@ -1,3 +1,11 @@
+2012-02-27  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* NEWS: Mention backport.
+	* patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch:
+	Backport of S4465490: Suspicious about double-check locking idiom being
+	used in the code.
+
 2012-02-27  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 44f51ec924fa -r 54ceda20a02c Makefile.am
--- a/Makefile.am	Mon Feb 27 11:50:34 2012 +0100
+++ b/Makefile.am	Mon Feb 27 14:40:52 2012 +0100
@@ -422,7 +422,8 @@
 	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
 	patches/openjdk/remove-mimpure-option-to-gcc.patch \
 	patches/ScriptEngineManager-doc.patch \
-	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch
+	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
+	patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 44f51ec924fa -r 54ceda20a02c NEWS
--- a/NEWS	Mon Feb 27 11:50:34 2012 +0100
+++ b/NEWS	Mon Feb 27 14:40:52 2012 +0100
@@ -19,6 +19,7 @@
   - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
   - S6761072: new krb5 tests fail on multiple platforms
   - S6883983: JarVerifier dependency on sun.security.pkcs should be removed
+  - S4465490: Suspicious about double-check locking idiom being used in the code
 
 New in release 1.10.6 (2012-02-14):
 
diff -r 44f51ec924fa -r 54ceda20a02c patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch	Mon Feb 27 14:40:52 2012 +0100
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sherman
+# Date 1274070127 25200
+# Node ID 91bcd8fc04f27338ef31d18a7cc3b25f536015ef
+# Parent  2fb3d7dbaa32ed1846551c1301530c74c80d9f36
+4465490: Suspicious about double-check locking idiom being used in the code
+Summary: to use volatile for the double-checked object
+Reviewed-by: weijun
+
+diff -r 2fb3d7dbaa32 -r 91bcd8fc04f2 src/share/classes/java/util/jar/JarVerifier.java
+--- openjdk.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java	Fri May 14 13:46:53 2010 -0700
++++ openjdk/jdk/src/share/classes/java/util/jar/JarVerifier.java	Sun May 16 21:22:07 2010 -0700
+@@ -76,7 +76,7 @@
+     private ByteArrayOutputStream baos;
+ 
+     /** The ManifestDigester object */
+-    private ManifestDigester manDig;
++    private volatile ManifestDigester manDig;
+ 
+     /** the bytes for the manDig object */
+     byte manifestRawBytes[] = null;