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

Fix NPE in SpringIndexer

Browse Source
This commit is contained in:
BoykoAlex
2018-10-09 12:43:11 -04:00
parent b5888a5d9b
commit 8f8334de67
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
View File

@@ -180,8 +180,14 @@ public class SpringIndexer {
public CompletableFuture<Void> initializeProject(IJavaProject project) {
try {
if (BootProjectUtil.isBootProject(project)) {
InitializeProject initializeItem = new InitializeProject(project);
return CompletableFuture.runAsync(initializeItem, this.updateQueue);
if (project.getElementName() == null) {
// Projects indexed by name. No name - no index for it
log.debug("Project with NULL name is being initialized");
return CompletableFuture.completedFuture(null);
} else {
InitializeProject initializeItem = new InitializeProject(project);
return CompletableFuture.runAsync(initializeItem, this.updateQueue);
}
} else {
return deleteProject(project);
}
@@ -193,8 +199,14 @@ public class SpringIndexer {
public CompletableFuture<Void> deleteProject(IJavaProject project) {
try {
DeleteProject initializeItem = new DeleteProject(project);
return CompletableFuture.runAsync(initializeItem, this.updateQueue);
if (project.getElementName() == null) {
// Projects indexed by name. No name - no index for it
log.debug("Project with NULL name is being removed");
return CompletableFuture.completedFuture(null);
} else {
DeleteProject initializeItem = new DeleteProject(project);
return CompletableFuture.runAsync(initializeItem, this.updateQueue);
}
} catch (Throwable e) {
log.error("", e);
return Futures.error(e);
@@ -671,6 +683,10 @@ public class SpringIndexer {
}
private void removeSymbolsByProject(IJavaProject project) {
// If project name is null it cannot be in the cache
if (project.getElementName() == null) {
return;
}
List<SymbolInformation> oldSymbols = symbolsByProject.remove(project.getElementName());
if (oldSymbols != null) {
symbols.removeAll(oldSymbols);