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

PT #160188863: Don't crash LS when launched with JRE

Browse Source
This commit is contained in:
BoykoAlex
2018-08-30 22:22:32 -04:00
parent 997e9a0383
commit df10af0bc6
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/java/handlers/RunningAppProvider.java
View File

@@ -12,6 +12,8 @@ package org.springframework.ide.vscode.boot.java.handlers;
import java.util.Collection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.boot.app.cli.LocalSpringBootApp;
import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
@@ -20,6 +22,8 @@ import com.google.common.collect.ImmutableList;
public interface RunningAppProvider {
static final Logger log = LoggerFactory.getLogger(RunningAppProvider.class);
static RunningAppProvider composite(RunningAppProvider... children) {
if (children.length==1) {
return children[0];
@@ -36,13 +40,19 @@ public interface RunningAppProvider {
};
}
public static final RunningAppProvider LOCAL_APPS = LocalSpringBootApp::getAllRunningSpringApps;
// Don't put LocalSpringBootApp::getAllRunningSpringApps, thus class loading doesn't fail if LS launched with JRE instead of JDK
public static final RunningAppProvider LOCAL_APPS = () -> LocalSpringBootApp.getAllRunningSpringApps();
public static final RunningAppProvider NULL = () -> ImmutableList.of();
Collection<SpringBootApp> getAllRunningSpringApps() throws Exception;
static RunningAppProvider createDefault(SimpleLanguageServer server) {
return composite(LOCAL_APPS, new RemoteRunningAppsProvider(server));
try {
return composite(LOCAL_APPS, new RemoteRunningAppsProvider(server));
} catch (Throwable t) {
log.error("", t);
}
return NULL;
}
}