Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-01 21:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Threading: resolve a race in the unit tests: if the user thread wasn't initialised, don't crash trying to test if we're on it.

Browse Source
This commit is contained in:
Mike Hearn
2013-10-08 11:47:06 +02:00
committed by Andreas Schildbach
parent cb45e306df
commit 1d4ff1770e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/google/bitcoin/utils/Threading.java
View File

@@ -50,7 +50,7 @@ public class Threading {
public static final Executor SAME_THREAD;
// For safety reasons keep track of the thread we use to run user-provided event listeners to avoid deadlock.
private static WeakReference<Thread> userThread;
private static volatile WeakReference<Thread> vUserThread;
/**
* Put a dummy task into the queue and wait for it to be run. Because it's single threaded, this means all
@@ -63,8 +63,10 @@ public class Threading {
// If this assert fires it means you have a bug in your code - you can't call this method inside your own
// event handlers because it would never return. If you aren't calling this method explicitly, then that
// means there's a bug in bitcoinj.
checkState(userThread.get() != null && userThread.get() != Thread.currentThread(),
"waitForUserCode() run on user code thread would deadlock.");
if (vUserThread != null) {
checkState(vUserThread.get() != null && vUserThread.get() != Thread.currentThread(),
"waitForUserCode() run on user code thread would deadlock.");
}
Futures.getUnchecked(USER_THREAD.submit(Callables.returning(null)));
}
@@ -93,7 +95,7 @@ public class Threading {
t.setName("bitcoinj user thread");
t.setDaemon(true);
t.setUncaughtExceptionHandler(uncaughtExceptionHandler);
userThread = new WeakReference<Thread>(t);
vUserThread = new WeakReference<Thread>(t);
return t;
}
});