Fix NPE when the server is stopped due to a failure during

initialization
eclipse · Jul 26, 2022 · 2da3913 · 2da3913
1 parent 2632a55
commit 2da3913
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
@@ -243,7 +243,8 @@ public synchronized void start() throws IOException {
 					stop();
 				}
 				return null;
-			}).thenApply(unused -> {
+			});
+			initializeFuture.thenCombineAsync(initializeFuture, (unused1, unused2) -> {
 				try {
 					LanguageClientImpl client = serverDefinition.createLanguageClient();
 					String theardNameFormat = "LS-" + serverDefinition.id + "-launcher-%d"; //$NON-NLS-1$ //$NON-NLS-2$