apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-28 00:22:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cannot re-use daemon with sdkman java 8.0.265.hs-adpt

Browse Source
This commit is contained in:
Peter Palaga
2020-09-16 13:38:59 +02:00
parent c066ba5f14
commit dfba788fc9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java
View File

@@ -261,6 +261,7 @@ public class DaemonConnector {
args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000"); args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000");
} }
args.add("-Dmvnd.home=\"" + mavenHome + "\""); args.add("-Dmvnd.home=\"" + mavenHome + "\"");
args.add("-Dmvnd.java.home=\"" + layout.javaHome().toString() + "\"");
args.add("-Dlogback.configurationFile=\"" + layout.getLogbackConfigurationPath() + "\""); args.add("-Dlogback.configurationFile=\"" + layout.getLogbackConfigurationPath() + "\"");
args.add("-Ddaemon.uid=" + uid); args.add("-Ddaemon.uid=" + uid);
args.add("-Xmx4g"); args.add("-Xmx4g");

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
View File

@@ -100,7 +100,7 @@ public class Server implements AutoCloseable, Runnable {
List<String> opts = new ArrayList<>(); List<String> opts = new ArrayList<>();
long cur = System.currentTimeMillis(); 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(), info = new DaemonInfo(uid, javaHome.toString(), layout.mavenHome().toString(),
DaemonRegistry.getProcessId(), socket.socket().getLocalPort(), DaemonRegistry.getProcessId(), socket.socket().getLocalPort(),
idleTimeout, Locale.getDefault().toLanguageTag(), opts, idleTimeout, Locale.getDefault().toLanguageTag(), opts,