From 0ccb363044df0297e4e34b93039b160c915f44dc Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Tue, 17 Jan 2023 11:10:08 +0800 Subject: [PATCH] =?UTF-8?q?errorResume=E5=8F=98=E9=87=8F=E6=94=B9=E6=88=90?= =?UTF-8?q?ignoreError?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builder/el/operator/IgnoreErrorOperator.java | 2 +- .../flow/element/condition/WhenCondition.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java index e6990f6ce..ede076eb7 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java @@ -20,7 +20,7 @@ public class IgnoreErrorOperator extends BaseOperator { WhenCondition condition = OperatorHelper.convert(objects[0], WhenCondition.class); Boolean ignoreError = OperatorHelper.convert(objects[1], Boolean.class); - condition.setErrorResume(ignoreError); + condition.setIgnoreError(ignoreError); return condition; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java index ecdd6a4fa..2bdcdc777 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java @@ -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() {