From 193f1e4018d5b6513706a9ac220d257eaaaa232a Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 17 Jun 2019 11:06:43 -0700 Subject: [PATCH] Fix race condition causing test failure --- .../springframework/ide/vscode/boot/app/SpringSymbolIndex.java | 2 +- .../ide/vscode/boot/java/utils/test/SpringIndexerTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index 96f27598b..b976fd504 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -324,7 +324,7 @@ public class SpringSymbolIndex implements InitializingBean { return ""; } }; - futures.add(CompletableFuture.runAsync(() -> updateItem(maybeProject.get(), docURI, lastModified, content, indexer), this.updateQueue)); + futures.add(updateItem(maybeProject.get(), docURI, lastModified, content, indexer)); } catch (Exception e) { log.error("", e); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java index acb826a7b..1e7442148 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java @@ -193,7 +193,6 @@ public class SpringIndexerTest { @Test public void testNewDocumentCreated() throws Exception { String createdDocURI = directory.toPath().resolve("src/main/java/org/test/CreatedClass.java").toUri().toString(); - // check for document to not be created yet List symbols = indexer.getSymbols(createdDocURI); assertNotNull(symbols);