diff options
author | psandoz <none@none> | 2014-12-02 13:41:18 +0100 |
---|---|---|
committer | psandoz <none@none> | 2014-12-02 13:41:18 +0100 |
commit | 1c45369790de2b97ca2203db4b5c41922c54d9b9 (patch) | |
tree | ed0e9f6694393c21e7dbd3fddda81d0bbf47183f /src/share/classes/java/util/concurrent | |
parent | 442b72695f17b4cec62151d77ff2300637eeea05 (diff) | |
download | jdk8u_jdk-1c45369790de2b97ca2203db4b5c41922c54d9b9.tar.gz |
8066397: Remove network-related seed initialization code in ThreadLocal/SplittableRandom
Reviewed-by: alanb, dl, chegar, rriggs, shade
Diffstat (limited to 'src/share/classes/java/util/concurrent')
-rw-r--r-- | src/share/classes/java/util/concurrent/ThreadLocalRandom.java | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/share/classes/java/util/concurrent/ThreadLocalRandom.java index 2606bed44b..95cc6549b9 100644 --- a/src/share/classes/java/util/concurrent/ThreadLocalRandom.java +++ b/src/share/classes/java/util/concurrent/ThreadLocalRandom.java @@ -36,8 +36,6 @@ package java.util.concurrent; import java.io.ObjectStreamField; -import java.net.NetworkInterface; -import java.util.Enumeration; import java.util.Random; import java.util.Spliterator; import java.util.concurrent.atomic.AtomicInteger; @@ -147,34 +145,7 @@ public class ThreadLocalRandom extends Random { s = (s << 8) | ((long)(seedBytes[i]) & 0xffL); return s; } - long h = 0L; - try { - Enumeration<NetworkInterface> ifcs = - NetworkInterface.getNetworkInterfaces(); - boolean retry = false; // retry once if getHardwareAddress is null - while (ifcs.hasMoreElements()) { - NetworkInterface ifc = ifcs.nextElement(); - if (!ifc.isVirtual()) { // skip fake addresses - byte[] bs = ifc.getHardwareAddress(); - if (bs != null) { - int n = bs.length; - int m = Math.min(n >>> 1, 4); - for (int i = 0; i < m; ++i) - h = (h << 16) ^ (bs[i] << 8) ^ bs[n-1-i]; - if (m < 4) - h = (h << 8) ^ bs[n-1-m]; - h = mix64(h); - break; - } - else if (!retry) - retry = true; - else - break; - } - } - } catch (Exception ignore) { - } - return (h ^ mix64(System.currentTimeMillis()) ^ + return (mix64(System.currentTimeMillis()) ^ mix64(System.nanoTime())); } |