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

!202 处理SwitchCondition中的NPE风险

Browse Source 
Merge pull request !202 from zcl/master
This commit is contained in:
铂赛东
2023-08-14 14:45:39 +00:00
committed by Gitee
parent b4ef1dc829 cf93cd43aa
commit 09eb4ba5b5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java
View File

@@ -57,14 +57,14 @@ public class SwitchCondition extends Condition {
String _targetId = target[0];
String _targetTag = target[1];
targetExecutor = targetList.stream().filter(executable -> {
return (StrUtil.startWith(_targetId, TAG_PREFIX) && _targetTag.equals(executable.getTag()))
return (StrUtil.startWith(_targetId, TAG_PREFIX) && ObjectUtil.equal(_targetTag,executable.getTag()))
|| ((StrUtil.isEmpty(_targetId) || _targetId.equals(executable.getId()))
&& (StrUtil.isEmpty(_targetTag) || _targetTag.equals(executable.getTag())));
}).findFirst().orElse(null);
}
else {
targetExecutor = targetList.stream()
.filter(executable -> executable.getId().equals(targetId))
.filter(executable -> ObjectUtil.equal(executable.getId(),targetId) )
.findFirst()
.orElse(null);
}