Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed NPE when there are no symbols for a project (in case something went wrong)

Browse Source
This commit is contained in:
Martin Lippert
2023-07-14 12:58:16 +02:00
parent 2272c81d47
commit b3af8580ff
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java
View File

@@ -723,7 +723,10 @@ public class SpringSymbolIndex implements InitializingBean, SpringIndex {
CompletableFuture<Void> latestTask = this.latestScheduledTaskByProject.get(projectName);
if (latestTask != null) {
return latestTask.thenApply((e) -> Arrays.asList(springIndex.getBeansOfProject(projectName)));
return latestTask.thenApply((e) -> {
Bean[] beansOfProject = springIndex.getBeansOfProject(projectName);
return beansOfProject != null ? Arrays.asList(beansOfProject) : Collections.emptyList();
});
}
else {
return CompletableFuture.completedFuture(null);
@@ -738,7 +741,10 @@ public class SpringSymbolIndex implements InitializingBean, SpringIndex {
CompletableFuture<Void> latestTask = this.latestScheduledTaskByProject.get(projectName);
if (latestTask != null) {
return latestTask.thenApply((e) -> Arrays.asList(springIndex.getMatchingBeans(projectName, matchType)));
return latestTask.thenApply((e) -> {
Bean[] matchingBeans = springIndex.getMatchingBeans(projectName, matchType);
return matchingBeans != null ? Arrays.asList(matchingBeans) : Collections.emptyList();
});
}
else {
return CompletableFuture.completedFuture(null);