|
|
@ -669,12 +669,14 @@ public class WorkflowExecuteThread implements Runnable { |
|
|
|
if (taskTimeoutCheckList.containsKey(taskInstance.getId())) { |
|
|
|
if (taskTimeoutCheckList.containsKey(taskInstance.getId())) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (taskInstance.getTaskDefine() == null) { |
|
|
|
TaskDefinition taskDefinition = processService.findTaskDefinition( |
|
|
|
TaskDefinition taskDefinition = processService.findTaskDefinition( |
|
|
|
taskInstance.getTaskCode(), |
|
|
|
taskInstance.getTaskCode(), |
|
|
|
taskInstance.getTaskDefinitionVersion() |
|
|
|
taskInstance.getTaskDefinitionVersion() |
|
|
|
); |
|
|
|
); |
|
|
|
taskInstance.setTaskDefine(taskDefinition); |
|
|
|
taskInstance.setTaskDefine(taskDefinition); |
|
|
|
if (TimeoutFlag.OPEN == taskDefinition.getTimeoutFlag()) { |
|
|
|
} |
|
|
|
|
|
|
|
if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) { |
|
|
|
this.taskTimeoutCheckList.put(taskInstance.getId(), taskInstance); |
|
|
|
this.taskTimeoutCheckList.put(taskInstance.getId(), taskInstance); |
|
|
|
} |
|
|
|
} |
|
|
|
if (taskInstance.isDependTask() || taskInstance.isSubProcess()) { |
|
|
|
if (taskInstance.isDependTask() || taskInstance.isSubProcess()) { |
|
|
@ -686,12 +688,13 @@ public class WorkflowExecuteThread implements Runnable { |
|
|
|
if (taskRetryCheckList.containsKey(taskInstance.getId())) { |
|
|
|
if (taskRetryCheckList.containsKey(taskInstance.getId())) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
TaskDefinition taskDefinition = taskInstance.getTaskDefine(); |
|
|
|
if (taskInstance.getTaskDefine() == null) { |
|
|
|
if (taskDefinition == null) { |
|
|
|
TaskDefinition taskDefinition = processService.findTaskDefinition( |
|
|
|
logger.error("taskDefinition is null, taskId:{}", taskInstance.getId()); |
|
|
|
taskInstance.getTaskCode(), |
|
|
|
return; |
|
|
|
taskInstance.getTaskDefinitionVersion() |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
taskInstance.setTaskDefine(taskDefinition); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (taskInstance.taskCanRetry()) { |
|
|
|
if (taskInstance.taskCanRetry()) { |
|
|
|
this.taskRetryCheckList.put(taskInstance.getId(), taskInstance); |
|
|
|
this.taskRetryCheckList.put(taskInstance.getId(), taskInstance); |
|
|
|
} |
|
|
|
} |
|
|
|