This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch mvnd-1.x in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit ebd56b6279d2c4724c6d3e62a043cb0644005368 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Nov 25 16:20:43 2025 +0100 Fix daemon not being reused when using --debug option (#1483) (cherry picked from commit 42eea9e0d73a3c54f89c3c80ffbe17957789b86d) Applied unchanged; the 1.x code has the same structure. --- .../main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java | 9 +++++++++ .../src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java index d72ee2e7..8a7142c8 100644 --- a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java +++ b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java @@ -362,6 +362,15 @@ public class DefaultClient implements Client { }); Environment.MVND_TERMINAL_WIDTH.addCommandLineOption(args, width); + if (parameters.property(Environment.MVND_DEBUG).asBoolean()) { + if (Environment.MVND_KEEP_ALIVE.getCommandLineOption(args) == null) { + System.setProperty(Environment.MVND_KEEP_ALIVE.getProperty(), "1h"); + } + if (Environment.MVND_CONNECT_TIMEOUT.getCommandLineOption(args) == null) { + System.setProperty(Environment.MVND_CONNECT_TIMEOUT.getProperty(), "1h"); + } + } + final DaemonConnector connector = new DaemonConnector(parameters, registry); try (DaemonClientConnection daemon = connector.connect(output)) { output.setDaemonId(daemon.getDaemon().getId()); diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java index 56eedfcd..5189a1d9 100644 --- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java +++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java @@ -446,12 +446,6 @@ public class DaemonConnector { address = host + ":" + iPort; output.accept(Message.buildStatus("Daemon listening for debugger on address: " + address)); args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + address); - if (Environment.MVND_KEEP_ALIVE.getCommandLineOption(args) == null) { - System.setProperty(Environment.MVND_KEEP_ALIVE.getProperty(), "1h"); - } - if (Environment.MVND_CONNECT_TIMEOUT.getCommandLineOption(args) == null) { - System.setProperty(Environment.MVND_CONNECT_TIMEOUT.getProperty(), "1h"); - } } // jvm args String jvmArgs = parameters.jvmArgs();
