Mercurial > hg > openjdk > jdk6 > jdk

changeset 1260:4b12c8b2b527 jdk6-b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OPENJDK6-68: Ensure SharedSecrets are initialised Reviewed-by: omajid
author andrew
date Wed, 11 Nov 2015 01:18:18 +0000
parents 2bec5fb84a6f
children f7306eda515f
files src/share/classes/sun/misc/SharedSecrets.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/misc/SharedSecrets.java	Tue Sep 01 09:37:34 2015 -0700
+++ b/src/share/classes/sun/misc/SharedSecrets.java	Wed Nov 11 01:18:18 2015 +0000
@@ -137,7 +137,7 @@
 
     public static JavaSecurityAccess getJavaSecurityAccess() {
         if (javaSecurityAccess == null) {
-            unsafe.ensureClassInitialized(AccessController.class);
+            unsafe.ensureClassInitialized(ProtectionDomain.class);
         }
         return javaSecurityAccess;
     }
@@ -167,6 +167,9 @@
     }
 
     public static JavaIOFileAccess getJavaIOFileAccess() {
+        if (javaIOFileAccess == null) {
+            unsafe.ensureClassInitialized(File.class);
+        }
         return javaIOFileAccess;
     }
 }