AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-12 13:26:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix task.getLastException does not receive subtasks' value

Browse Source
This commit is contained in:
huanghongxun 2019-02-20 20:07:11 +08:00
parent e940845c60
commit 3ae826d9ca
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java
View File

@ -24,6 +24,7 @@ import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level; import java.util.logging.Level;
/** /**
@ -64,7 +65,7 @@ public final class TaskExecutor {
public TaskExecutor start() { public TaskExecutor start() {
taskListeners.forEach(TaskListener::onStart); taskListeners.forEach(TaskListener::onStart);
workerQueue.add(scheduler.schedule(() -> { workerQueue.add(scheduler.schedule(() -> {
boolean flag = executeTasks(Collections.singleton(firstTask)); boolean flag = executeTasks(Collections.singleton(firstTask), new AtomicReference<>());
taskListeners.forEach(it -> it.onStop(flag, this)); taskListeners.forEach(it -> it.onStop(flag, this));
})); }));
return this; return this;
@ -74,7 +75,7 @@ public final class TaskExecutor {
taskListeners.forEach(TaskListener::onStart); taskListeners.forEach(TaskListener::onStart);
AtomicBoolean flag = new AtomicBoolean(true); AtomicBoolean flag = new AtomicBoolean(true);
Future<?> future = scheduler.schedule(() -> { Future<?> future = scheduler.schedule(() -> {
flag.set(executeTasks(Collections.singleton(firstTask))); flag.set(executeTasks(Collections.singleton(firstTask), new AtomicReference<>()));
taskListeners.forEach(it -> it.onStop(flag.get(), this)); taskListeners.forEach(it -> it.onStop(flag.get(), this));
}); });
workerQueue.add(future); workerQueue.add(future);
@ -100,7 +101,7 @@ public final class TaskExecutor {
} }
} }
private boolean executeTasks(Collection<? extends Task> tasks) throws InterruptedException { private boolean executeTasks(Collection<? extends Task> tasks, AtomicReference<Exception> exception) throws InterruptedException {
if (tasks.isEmpty()) if (tasks.isEmpty())
return true; return true;
@ -128,6 +129,8 @@ public final class TaskExecutor {
} catch (InterruptedException e) { } catch (InterruptedException e) {
return false; return false;
} }
exception.set(tasks.stream().map(Task::getLastException).filter(Objects::nonNull).findAny().orElse(null));
return success.get() && !canceled; return success.get() && !canceled;
} }
@ -160,9 +163,12 @@ public final class TaskExecutor {
} }
} }
boolean doDependentsSucceeded = executeTasks(task.getDependents()); AtomicReference<Exception> dependentsException = new AtomicReference<>();
if (!doDependentsSucceeded && task.isRelyingOnDependents() || canceled) boolean doDependentsSucceeded = executeTasks(task.getDependents(), dependentsException);
if (!doDependentsSucceeded && task.isRelyingOnDependents() || canceled) {
task.setLastException(dependentsException.get());
throw new SilentException(); throw new SilentException();
}
if (doDependentsSucceeded) if (doDependentsSucceeded)
task.setDependentsSucceeded(); task.setDependentsSucceeded();
@ -187,9 +193,11 @@ public final class TaskExecutor {
variables.set(taskResult.getId(), taskResult.getResult()); variables.set(taskResult.getId(), taskResult.getResult());
} }
boolean doDependenciesSucceeded = executeTasks(task.getDependencies()); AtomicReference<Exception> dependenciesException = new AtomicReference<>();
boolean doDependenciesSucceeded = executeTasks(task.getDependencies(), dependenciesException);
if (!doDependenciesSucceeded && task.isRelyingOnDependencies()) { if (!doDependenciesSucceeded && task.isRelyingOnDependencies()) {
Logging.LOG.severe("Subtasks failed for " + task.getName()); Logging.LOG.severe("Subtasks failed for " + task.getName());
task.setLastException(dependenciesException.get());
throw new SilentException(); throw new SilentException();
} }