mirror of https://gitee.com/dromara/liteFlow
Pre Merge pull request !357 from 金闪闪/fix/notcondition-npe
This commit is contained in:
commit
7dee2bfcdd
|
|
@ -37,7 +37,7 @@ public class CatchCondition extends Condition {
|
|||
//ChainEndException属于用户主动结束流程,不应该进入Catch的流程
|
||||
throw e;
|
||||
}catch (Exception e) {
|
||||
LOG.error("catch exception:" + e.getMessage(), e);
|
||||
LOG.warn("catch exception (handled):" + e.getMessage(), e);
|
||||
Executable doExecutable = this.getDoItem();
|
||||
if (ObjectUtil.isNotNull(doExecutable)) {
|
||||
doExecutable.setCurrChainId(this.getCurrChainId());
|
||||
|
|
@ -70,4 +70,4 @@ public class CatchCondition extends Condition {
|
|||
this.addExecutable(ConditionKey.DO_KEY, executable);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -20,7 +20,8 @@ public class NotCondition extends Condition {
|
|||
|
||||
item.setCurrChainId(this.getCurrChainId());
|
||||
item.execute(slotIndex);
|
||||
boolean flag = item.getItemResultMetaValue(slotIndex);
|
||||
Boolean resultValue = item.getItemResultMetaValue(slotIndex);
|
||||
boolean flag = BooleanUtil.isTrue(resultValue);
|
||||
|
||||
LOG.info("the result of boolean component [{}] is [{}]", item.getId(), flag);
|
||||
|
||||
|
|
@ -52,4 +53,4 @@ public class NotCondition extends Condition {
|
|||
return this.getExecutableOne(ConditionKey.NOT_ITEM_KEY);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue