From dfba788fc9d5bd0637c5a741af32db620d0c4ff1 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Wed, 16 Sep 2020 13:38:59 +0200 Subject: [PATCH] Cannot re-use daemon with sdkman java 8.0.265.hs-adpt --- .../main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java | 1 + daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java index c7204dbc..e214a65c 100644 --- a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java +++ b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java @@ -261,6 +261,7 @@ public class DaemonConnector { args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000"); } args.add("-Dmvnd.home=\"" + mavenHome + "\""); + args.add("-Dmvnd.java.home=\"" + layout.javaHome().toString() + "\""); args.add("-Dlogback.configurationFile=\"" + layout.getLogbackConfigurationPath() + "\""); args.add("-Ddaemon.uid=" + uid); args.add("-Xmx4g"); diff --git a/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java index 5a1d91c5..27510185 100644 --- a/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java +++ b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java @@ -100,7 +100,7 @@ public class Server implements AutoCloseable, Runnable { List opts = new ArrayList<>(); long cur = System.currentTimeMillis(); - final Path javaHome = Paths.get(System.getProperty("java.home")).toRealPath(); + final Path javaHome = Paths.get(System.getProperty("mvnd.java.home")); info = new DaemonInfo(uid, javaHome.toString(), layout.mavenHome().toString(), DaemonRegistry.getProcessId(), socket.socket().getLocalPort(), idleTimeout, Locale.getDefault().toLanguageTag(), opts,