Fix: use import.gradle.java.home in prior (#1534)

microsoft · Jul 30, 2024 · 8400fdc · 8400fdc
1 parent ff9ce62
commit 8400fdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/extension/src/server/serverUtil.ts b/extension/src/server/serverUtil.ts
@@ -1,4 +1,9 @@
-import { checkEnvJavaExecutable, findValidJavaHome, getRedHatJavaEmbeddedJRE } from "../util/config";
+import {
+    checkEnvJavaExecutable,
+    findValidJavaHome,
+    getConfigJavaImportGradleJavaHome,
+    getRedHatJavaEmbeddedJRE,
+} from "../util/config";
 
 export function getGradleServerCommand(): string {
     const platform = process.platform;
@@ -16,7 +21,7 @@ export interface ProcessEnv {
 }
 
 export async function getGradleServerEnv(): Promise<ProcessEnv | undefined> {
-    const javaHome = getRedHatJavaEmbeddedJRE() || (await findValidJavaHome());
+    const javaHome = getConfigJavaImportGradleJavaHome() || getRedHatJavaEmbeddedJRE() || (await findValidJavaHome());
     const env = { ...process.env };
     if (javaHome) {
         Object.assign(env, {

diff --git a/extension/src/util/config.ts b/extension/src/util/config.ts
@@ -34,7 +34,7 @@ export function getJavaExecutablePathFromJavaHome(javaHome: string): string {
 }
 
 export async function findValidJavaHome(): Promise<string | undefined> {
-    const javaHomeGetters = [getJdtlsConfigJavaHome, getConfigJavaHome, getConfigJavaImportGradleJavaHome];
+    const javaHomeGetters = [getJdtlsConfigJavaHome, getConfigJavaHome];
     let javaHome: string | undefined = undefined;
     let javaVersion = 0;