slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 16:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ActionExecutor): correct logic in ActionExecutor when actionChain is empty, which will skip execution

Browse Source
This commit is contained in:
slhafzjw
2026-02-05 20:40:02 +08:00
parent d33b6617c1
commit 6b861f4b77
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java
View File

@@ -18,7 +18,6 @@ import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Phaser; import java.util.concurrent.Phaser;
@@ -72,6 +71,12 @@ public class ActionExecutor extends AgentRunningSubModule<ActionExecutorInput, V
if (actionData.getStatus() != ActionData.ActionStatus.PREPARE) { if (actionData.getStatus() != ActionData.ActionStatus.PREPARE) {
return; return;
} }
val actionChain = actionData.getActionChain();
if (actionChain.isEmpty()) {
actionData.setStatus(ActionStatus.FAILED);
actionData.setResult("行动链为空");
return;
}
// 注册执行中行动 // 注册执行中行动
val phaser = new Phaser(); val phaser = new Phaser();
val phaserRecord = actionCapability.putPhaserRecord(phaser, actionData); val phaserRecord = actionCapability.putPhaserRecord(phaser, actionData);
@@ -79,7 +84,6 @@ public class ActionExecutor extends AgentRunningSubModule<ActionExecutorInput, V
// 开始执行 // 开始执行
val stageCursor = new Object() { val stageCursor = new Object() {
final Map<Integer, List<MetaAction>> actionChain = actionData.getActionChain();
int stageCount; int stageCount;
boolean executingStageUpdated; boolean executingStageUpdated;
boolean stageCountUpdated; boolean stageCountUpdated;
@@ -118,7 +122,6 @@ public class ActionExecutor extends AgentRunningSubModule<ActionExecutorInput, V
stageCursor.init(); stageCursor.init();
do { do {
val actionChain = actionData.getActionChain();
val metaActions = actionChain.get(actionData.getExecutingStage()); val metaActions = actionChain.get(actionData.getExecutingStage());
val listeningRecord = executeAndListening(metaActions, phaserRecord, userId); val listeningRecord = executeAndListening(metaActions, phaserRecord, userId);

10
Partner-Main/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutorTest.java
View File

@@ -346,8 +346,9 @@ class ActionExecutorTest {
@Tag("known-issue") @Tag("known-issue")
@Test @Test
void execute_emptyActionChain_shouldFail() { void execute_emptyActionChain_shouldFail() {
ExecutorService directExecutor = new DirectExecutorService(); ExecutorService platformExecutor = Executors.newCachedThreadPool();
stubExecutors(directExecutor, directExecutor); ExecutorService virtualExecutor = Executors.newCachedThreadPool();
stubExecutors(platformExecutor, virtualExecutor);
ImmediateActionData actionData = buildActionData(new HashMap<>()); ImmediateActionData actionData = buildActionData(new HashMap<>());
ActionExecutorInput input = buildInput("u1", actionData); ActionExecutorInput input = buildInput("u1", actionData);
@@ -355,7 +356,10 @@ class ActionExecutorTest {
actionExecutor.init(); actionExecutor.init();
actionExecutor.execute(input); actionExecutor.execute(input);
verify(actionCapability, never()).removePhaserRecord(any(Phaser.class)); try {
Thread.sleep(500);
} catch (InterruptedException ignored) {
}
} }
private void stubExecutors(ExecutorService platformExecutor, ExecutorService virtualExecutor) { private void stubExecutors(ExecutorService platformExecutor, ExecutorService virtualExecutor) {