未验证 提交 5dad635f 编写于 作者: W wind 提交者: GitHub

[cherry-pick-2.0.1][Bug-7307][MasterServer] timeout event was filtered (#7303)

* remove task filter when task timeout

* get lastest task instance info
Co-authored-by: Ncaishunfeng <534328519@qq.com>
上级 7ec4cb9d
...@@ -317,14 +317,14 @@ public class WorkflowExecuteThread implements Runnable { ...@@ -317,14 +317,14 @@ public class WorkflowExecuteThread implements Runnable {
private boolean taskTimeout(StateEvent stateEvent) { private boolean taskTimeout(StateEvent stateEvent) {
if (taskInstanceHashMap.containsRow(stateEvent.getTaskInstanceId())) { if (!taskInstanceHashMap.containsRow(stateEvent.getTaskInstanceId())) {
return true; return true;
} }
TaskInstance taskInstance = taskInstanceHashMap // get lastest task instance into
.row(stateEvent.getTaskInstanceId()) TaskInstance taskInstance = processService.findTaskInstanceById(stateEvent.getTaskInstanceId());
.values() TaskDefinition taskDefinition = processService.findTaskDefinition(taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion());
.iterator().next(); taskInstance.setTaskDefine(taskDefinition);
if (TimeoutFlag.CLOSE == taskInstance.getTaskDefine().getTimeoutFlag()) { if (TimeoutFlag.CLOSE == taskInstance.getTaskDefine().getTimeoutFlag()) {
return true; return true;
...@@ -704,7 +704,6 @@ public class WorkflowExecuteThread implements Runnable { ...@@ -704,7 +704,6 @@ public class WorkflowExecuteThread implements Runnable {
} }
} }
/** /**
* find task instance in db. * find task instance in db.
* in case submit more than one same name task in the same time. * in case submit more than one same name task in the same time.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册