andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#5720] Static initializers can cause deadlock

Browse Source 
Motivation:

SystemPropertyUtil requires InternalLoggerFactory requires ThreadLocalRandom requires SystemPropertyUtil. This can lead to a dead-lock.

Modifications:

Ensure ThreadLocalRandom does not require SystemPropertyUtil during initialization.

Result:

No more deadlock possible.
This commit is contained in:
Norman Maurer 2016-08-19 14:15:19 +02:00
parent 8d1e46ffd1
commit e4154bcb0b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
View File

@ -66,8 +66,7 @@ public final class ThreadLocalRandom extends Random {
private static final AtomicLong seedUniquifier = new AtomicLong(); private static final AtomicLong seedUniquifier = new AtomicLong();
private static volatile long initialSeedUniquifier = private static volatile long initialSeedUniquifier;
SystemPropertyUtil.getLong("io.netty.initialSeedUniquifier", 0);
private static final Thread seedGeneratorThread; private static final Thread seedGeneratorThread;
private static final BlockingQueue<Long> seedQueue; private static final BlockingQueue<Long> seedQueue;
@ -75,11 +74,18 @@ public final class ThreadLocalRandom extends Random {
private static volatile long seedGeneratorEndTime; private static volatile long seedGeneratorEndTime;
static { static {
initialSeedUniquifier = AccessController.doPrivileged(new PrivilegedAction<Long>() {
@Override
public Long run() {
return Long.getLong("io.netty.initialSeedUniquifier", 0);
}
});
if (initialSeedUniquifier == 0) { if (initialSeedUniquifier == 0) {
boolean secureRandom = AccessController.doPrivileged(new PrivilegedAction<Boolean>() { boolean secureRandom = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
@Override @Override
public Boolean run() { public Boolean run() {
return SystemPropertyUtil.getBoolean("java.util.secureRandomSeed", false); return Boolean.getBoolean("java.util.secureRandomSeed");
} }
}); });