wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2596-修复NPE问题

Browse Source
This commit is contained in:
yangqicheng 2024-07-12 17:14:32 +08:00
parent af26c4bb6d
commit 7c1b5b1a48
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/version/MultiVersionBeanUtils.java
View File

@ -28,7 +28,7 @@ public class MultiVersionBeanUtils {
throw new NullPointerException("no beans of type " + clazz.getName()); throw new NullPointerException("no beans of type " + clazz.getName());
} }
if (StringUtils.isEmpty(version)) { if (StringUtils.isEmpty(version)) {
T t = beans.values().stream().filter(bean -> bean.getVersion() == null).findFirst().orElse(null); T t = beans.values().stream().filter(bean -> bean.getVersion() == null || bean.getVersion() == UNKNOWN_VERSION).findFirst().orElse(null);
if (t != null) { if (t != null) {
return t; return t;
} }
@ -42,7 +42,8 @@ public class MultiVersionBeanUtils {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
DefaultArtifactVersion targetVersion = new DefaultArtifactVersion(version); DefaultArtifactVersion targetVersion = new DefaultArtifactVersion(version);
for (int i = sortedList.size() - 1; i >= 0; i--) { for (int i = sortedList.size() - 1; i >= 0; i--) {
int flag = sortedList.get(i).getVersion().compareTo(targetVersion); DefaultArtifactVersion classVersion = sortedList.get(i).getVersion() == null ? UNKNOWN_VERSION : sortedList.get(i).getVersion();
int flag = classVersion.compareTo(targetVersion);
if (flag <= 0) { if (flag <= 0) {
return sortedList.get(i); return sortedList.get(i);
} }