OpenJDK / jdk / jdk
changeset 45128:629171363c31
Merge
author | dholmes |
---|---|
date | Fri, 12 May 2017 02:06:04 +0000 |
parents | 9c8ac4361d9f f8961f9da1d4 |
children | 60283e4bfe7e |
files | |
diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java Thu May 11 18:04:24 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java Fri May 12 02:06:04 2017 +0000 @@ -49,6 +49,7 @@ import java.util.stream.LongStream; import java.util.stream.StreamSupport; import jdk.internal.misc.Unsafe; +import jdk.internal.misc.VM; /** * A random number generator isolated to the current thread. Like the @@ -1093,11 +1094,8 @@ // at end of <clinit> to survive static initialization circularity static { - if (java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction<>() { - public Boolean run() { - return Boolean.getBoolean("java.util.secureRandomSeed"); - }})) { + String sec = VM.getSavedProperty("java.util.secureRandomSeed"); + if (Boolean.parseBoolean(sec)) { byte[] seedBytes = java.security.SecureRandom.getSeed(8); long s = (long)seedBytes[0] & 0xffL; for (int i = 1; i < 8; ++i)