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

PT #162161994: Terminate LS properly for Atom client

Browse Source
This commit is contained in:
BoykoAlex
2018-11-26 20:09:06 -05:00
parent b2f62b2f08
commit e59b6a5698
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JavaProjectsServiceWithFallback.java
View File

@@ -45,8 +45,18 @@ public class JavaProjectsServiceWithFallback implements JavaProjectsService {
this.mainServiceInitialized = this.server
.onInitialized(main.initialize())
.toFuture();
this.server.onShutdown(() ->
mainServiceInitialized.thenAccept(Disposable::dispose).join()
this.server.onShutdown(() -> {
try {
if (!mainServiceInitialized.isCompletedExceptionally()) {
// If classpath listener has been added successfully, remove it
mainServiceInitialized.thenAccept(Disposable::dispose).join();
}
} catch (Exception e) {
// If completable future hasn't completed yet it might complete with exception to add classpath listener.
// Handle exception gracefully rather than failing LS process to terminate
log.error("", e);
}
}
);
}