From d377672706beaf152a45f2dbcae1089bc87656e5 Mon Sep 17 00:00:00 2001
From: BoykoAlex <aboyko@pivotal.io>
Date: Wed, 11 Aug 2021 10:37:54 -0400
Subject: [PATCH] Try Use java.home setting if spring settings for JDK isn't
 specified

---
 vscode-extensions/commons-vscode/src/launch-util.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vscode-extensions/commons-vscode/src/launch-util.ts b/vscode-extensions/commons-vscode/src/launch-util.ts
index 29b55dade..e3f98efee 100644
--- a/vscode-extensions/commons-vscode/src/launch-util.ts
+++ b/vscode-extensions/commons-vscode/src/launch-util.ts
@@ -90,6 +90,10 @@ function getUserDefinedJavaHome(wsOpts : VSCode.WorkspaceConfiguration) : string
     return javaOptions && javaOptions.home;
 }
 
+function getJdtUserDefinedJavaHome(): string {
+    return VSCode.workspace.getConfiguration('java')?.get('home');
+}
+
 export function activate(options: ActivatorOptions, context: VSCode.ExtensionContext): Thenable<LanguageClient> {
     let DEBUG = options.DEBUG;
     let jvmHeap = getUserDefinedJvmHeap(options.workspaceOptions, options.jvmHeap);
@@ -117,7 +121,7 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
 
         let findJRE = options.preferJdk ? findJdk : findJvm;
 
-        return findJRE(getUserDefinedJavaHome(options.workspaceOptions))
+        return findJRE(getUserDefinedJavaHome(options.workspaceOptions) || getJdtUserDefinedJavaHome())
         .catch(error => {
             VSCode.window.showErrorMessage("Error trying to find JVM: "+error);
             return Promise.reject(error);