From 964c1cbaa4a603319eb8c9383a6509dc5d47803a Mon Sep 17 00:00:00 2001
From: Samuel CLARENC <samuel.clarenc@teads.tv>
Date: Thu, 1 Jul 2021 13:48:27 +0200
Subject: [PATCH] Use java home to launch BSP server

---
 .../src/main/scala/sbt/internal/client/NetworkClient.scala | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 3ae676893..e7762726d 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -342,7 +342,12 @@ class NetworkClient(
                 s"either upgrade $sbtScript to its latest version or make sure it is accessible from $$PATH, and run 'sbt bspConfig'"
               )
             }
-            List("java") ++ arguments.sbtArguments ++
+            val java = Option(Properties.javaHome)
+              .map { javaHome =>
+                s"$javaHome/bin/java"
+              }
+              .getOrElse("java")
+            List(java) ++ arguments.sbtArguments ++
               List("-jar", lj, DashDashDetachStdio, DashDashServer)
           case _ =>
             List(arguments.sbtScript) ++ arguments.sbtArguments ++