Skip to content

Commit b749922

Browse files
committed
Fix possible NPE when moving to snapshots
See gh-43045
1 parent e40a768 commit b749922

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,21 @@ private BiFunction<Library, DependencyVersion, VersionOption> createOpenSourceVe
9292
VersionOption versionOption = resolver.apply(library, dependencyVersion);
9393
if (versionOption != null) {
9494
List<Release> releases = scheduledReleases.get(library.getCalendarName());
95-
List<Release> matches = releases.stream()
96-
.filter((release) -> dependencyVersion.isSnapshotFor(release.getVersion()))
97-
.toList();
98-
if (matches.isEmpty()) {
99-
if (logger.isInfoEnabled()) {
100-
logger.info("Ignoring {}. No release of {} scheduled before {}", dependencyVersion,
101-
library.getName(), milestone.getDueOn());
95+
if (releases != null) {
96+
List<Release> matches = releases.stream()
97+
.filter((release) -> dependencyVersion.isSnapshotFor(release.getVersion()))
98+
.toList();
99+
if (!matches.isEmpty()) {
100+
return new VersionOption.SnapshotVersionOption(versionOption.getVersion(),
101+
matches.get(0).getVersion());
102102
}
103-
return null;
104103
}
105-
return new VersionOption.SnapshotVersionOption(versionOption.getVersion(), matches.get(0).getVersion());
104+
if (logger.isInfoEnabled()) {
105+
logger.info("Ignoring {}. No release of {} scheduled before {}", dependencyVersion,
106+
library.getName(), milestone.getDueOn());
107+
}
106108
}
107-
return versionOption;
109+
return null;
108110
};
109111
}
110112

0 commit comments

Comments
 (0)