Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix Future task waiting logic. Fixes BUKKIT-2408

Browse Source 
Previously, the timeout would erroneously get converted to milliseconds
twice. The second conversion was removed.

Spurious wakeups were not handled properly, and would instead throw a
TimeoutException even if the waited time was not reached..
This commit is contained in:
Wesley Wolfe 2012-08-26 10:25:11 -05:00
parent cb84d6b994
commit 3307d489da
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java
View File

@ -48,14 +48,19 @@ class CraftFuture<T> extends CraftTask implements Future<T> {
public synchronized T get(long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { public synchronized T get(long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
timeout = unit.toMillis(timeout); timeout = unit.toMillis(timeout);
long period = this.getPeriod(); long period = this.getPeriod();
long timestamp = timeout > 0 ? System.currentTimeMillis() : 0l;
while (true) { while (true) {
if (period == -1l || period == -3l) { if (period == -1l || period == -3l) {
this.wait(unit.toMillis(timeout)); this.wait(timeout);
period = this.getPeriod(); period = this.getPeriod();
if (period == -1l || period == -3l) { if (period == -1l || period == -3l) {
if (timeout == 0l) { if (timeout == 0l) {
continue; continue;
} }
timeout += timestamp - (timestamp = System.currentTimeMillis());
if (timeout > 0) {
continue;
}
throw new TimeoutException(); throw new TimeoutException();
} }
} }