Skip to content

Commit f97994a

Browse files
Merge pull request #50472 from gastaldi/npe_dev
Fix NPE when no library versions exist in the DevUI
2 parents 5b54186 + 8ee28ab commit f97994a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

extensions/devui/deployment-spi/src/main/java/io/quarkus/devui/spi/page/CardPageBuildItem.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import java.net.MalformedURLException;
44
import java.net.URI;
55
import java.net.URL;
6-
import java.util.LinkedList;
6+
import java.util.ArrayList;
7+
import java.util.Collections;
78
import java.util.List;
89
import java.util.Optional;
910

@@ -14,10 +15,10 @@
1415
public final class CardPageBuildItem extends AbstractPageBuildItem {
1516

1617
private Optional<Card> optionalCard = Optional.empty();
17-
private List<LibraryLink> libraryVersions = null;
18+
private List<LibraryLink> libraryVersions;
1819

19-
private String darkLogo = null;
20-
private String lightLogo = null;
20+
private String darkLogo;
21+
private String lightLogo;
2122

2223
public CardPageBuildItem() {
2324
super();
@@ -43,12 +44,12 @@ public void addLibraryVersion(String groupId, String artifactId, String name, St
4344

4445
public void addLibraryVersion(String groupId, String artifactId, String name, URL url) {
4546
if (libraryVersions == null)
46-
libraryVersions = new LinkedList<>();
47+
libraryVersions = new ArrayList<>();
4748
libraryVersions.add(new LibraryLink(groupId, artifactId, name, url));
4849
}
4950

5051
public List<LibraryLink> getLibraryVersions() {
51-
return this.libraryVersions;
52+
return this.libraryVersions == null ? Collections.emptyList() : this.libraryVersions;
5253
}
5354

5455
public boolean hasLibraryVersions() {

extensions/devui/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ private void addLibraryLinks(Extension extension, CardPageBuildItem cardPageBuil
988988
(existing, replacement) -> existing // keep the first one
989989
));
990990

991-
if (cardPageBuildItem != null) {
991+
if (cardPageBuildItem != null && cardPageBuildItem.hasLibraryVersions()) {
992992
for (LibraryLink lib : cardPageBuildItem.getLibraryVersions()) {
993993
String key = lib.getGroupId() + ":" + lib.getArtifactId();
994994
String version = versionMap.get(key);

0 commit comments

Comments
 (0)