(maven-mvnd) branch master updated: Fix daemon not being reused when using --debug option (#1483)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git


The following commit(s) were added to refs/heads/master by this push:
     new 42eea9e0 Fix daemon not being reused when using --debug option (#1483)
42eea9e0 is described below

commit 42eea9e0d73a3c54f89c3c80ffbe17957789b86d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Nov 25 16:20:43 2025 +0100

    Fix daemon not being reused when using --debug option (#1483)
---
 .../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 084c65e7..2a3748a1 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
@@ -355,6 +355,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 1302f655..183c3df3 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -407,12 +407,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();