public/liteFlow
1
0
Fork 0
mirror of https://gitee.com/dromara/liteFlow.git synced 2026-05-15 04:22:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

errorResume变量改成ignoreError

Browse Source
This commit is contained in:
everywhere.z
2023-01-17 11:10:08 +08:00
parent ed7f29abbb
commit 0ccb363044
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java
View File

@@ -20,7 +20,7 @@ public class IgnoreErrorOperator extends BaseOperator<WhenCondition> {
WhenCondition condition = OperatorHelper.convert(objects[0], WhenCondition.class);
Boolean ignoreError = OperatorHelper.convert(objects[1], Boolean.class);
condition.setErrorResume(ignoreError);
condition.setIgnoreError(ignoreError);
return condition;
}

14
liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
View File

@@ -37,7 +37,7 @@ public class WhenCondition extends Condition {
private final Logger LOG = LoggerFactory.getLogger(this.getClass());
//只在when类型下有效，以区分当when调用链调用失败时是否继续往下执行 默认false不继续执行
private boolean errorResume = false;
private boolean ignoreError = false;
//只在when类型下有效，用于不同node进行同组合并，相同的组会进行合并，不同的组不会进行合并
//此属性已弃用
@@ -150,8 +150,8 @@ public class WhenCondition extends Condition {
timeOutWhenFutureObjList.forEach(whenFutureObj ->
LOG.warn("requestId [{}] executing thread has reached max-wait-seconds, thread canceled.Execute-item: [{}]", slot.getRequestId(), whenFutureObj.getExecutorName()));
//当配置了errorResume = false，出现interrupted或者!f.get()的情况，将抛出WhenExecuteException
if (!this.isErrorResume()) {
//当配置了ignoreError = false，出现interrupted或者!f.get()的情况，将抛出WhenExecuteException
if (!this.isIgnoreError()) {
if (interrupted[0]) {
throw new WhenExecuteException(StrUtil.format("requestId [{}] when execute interrupted. errorResume [false].", slot.getRequestId()));
}
@@ -169,12 +169,12 @@ public class WhenCondition extends Condition {
}
}
public boolean isErrorResume() {
return errorResume;
public boolean isIgnoreError() {
return ignoreError;
}
public void setErrorResume(boolean errorResume) {
this.errorResume = errorResume;
public void setIgnoreError(boolean ignoreError) {
this.ignoreError = ignoreError;
}
public String getGroup() {