Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-24 03:25:29 +01:00
Code Issues Projects Releases Wiki Activity

Wait and notify on the correct lock.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2012-10-04 06:13:19 +02:00
parent db8db1fba1
commit af2d692c59
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java
View File

@ -152,7 +152,7 @@ public class AsyncListenerHandler {
synchronized (stopLock) {
stoppedTasks.remove(id);
notifyAll();
stopLock.notifyAll();
running.set(false);
}
@ -269,10 +269,12 @@ public class AsyncListenerHandler {
* @throws InterruptedException - If the current thread was interrupted.
*/
private boolean waitForStops() throws InterruptedException {
while (stoppedTasks.size() > 0 && !cancelled) {
wait();
synchronized (stopLock) {
while (stoppedTasks.size() > 0 && !cancelled) {
stopLock.wait();
}
return cancelled;
}
return cancelled;
}
// DO NOT call this method from the main thread
@ -286,10 +288,8 @@ public class AsyncListenerHandler {
try {
// Wait if certain threads are stopping
synchronized (stopLock) {
if (waitForStops())
return;
}
if (waitForStops())
return;
// Proceed
started.incrementAndGet();
@ -375,7 +375,7 @@ public class AsyncListenerHandler {
// Individual shut down is irrelevant now
synchronized (stopLock) {
notifyAll();
stopLock.notifyAll();
}
}
}