From a96616a7516eeac57891f9bd03e894f45e07c83b Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 10 Nov 2020 18:26:19 +0100
Subject: [PATCH] Do not pass the maxKeepAlive as a parameter

---
 .../org/jboss/fuse/mvnd/client/DaemonClientConnection.java   | 5 ++---
 .../java/org/jboss/fuse/mvnd/client/DaemonConnector.java     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonClientConnection.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonClientConnection.java
index fd9e7e43..588d21fa 100644
--- a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonClientConnection.java
+++ b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonClientConnection.java
@@ -49,7 +49,6 @@ public class DaemonClientConnection implements Closeable {
     private final boolean newDaemon;
     private boolean hasReceived;
     private final Lock dispatchLock = new ReentrantLock();
-    private final int maxKeepAliveMs;
     private final BlockingQueue<Message> queue = new ArrayBlockingQueue<>(16);
     private final Thread receiver;
     private final AtomicBoolean running = new AtomicBoolean(true);
@@ -57,12 +56,11 @@ public class DaemonClientConnection implements Closeable {
     private final DaemonParameters parameters;
 
     public DaemonClientConnection(DaemonConnection connection, DaemonInfo daemon,
-            StaleAddressDetector staleAddressDetector, boolean newDaemon, int maxKeepAliveMs, DaemonParameters parameters) {
+            StaleAddressDetector staleAddressDetector, boolean newDaemon, DaemonParameters parameters) {
         this.connection = connection;
         this.daemon = daemon;
         this.staleAddressDetector = staleAddressDetector;
         this.newDaemon = newDaemon;
-        this.maxKeepAliveMs = maxKeepAliveMs;
         this.receiver = new Thread(this::doReceive);
         this.receiver.start();
         this.parameters = parameters;
@@ -96,6 +94,7 @@ public class DaemonClientConnection implements Closeable {
     }
 
     public List<Message> receive() throws ConnectException, StaleAddressException {
+        int maxKeepAliveMs = parameters.keepAliveMs() * parameters.maxLostKeepAlive();
         while (true) {
             try {
                 final Message m = queue.poll(maxKeepAliveMs, TimeUnit.MILLISECONDS);
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 16f6a9df..ecce10c7 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
@@ -326,9 +326,8 @@ public class DaemonConnector {
             throws DaemonException.ConnectException {
         LOGGER.debug("Connecting to Daemon");
         try {
-            int maxKeepAliveMs = parameters.keepAliveMs() * parameters.maxLostKeepAlive();
             DaemonConnection connection = connect(daemon.getAddress());
-            return new DaemonClientConnection(connection, daemon, staleAddressDetector, newDaemon, maxKeepAliveMs, parameters);
+            return new DaemonClientConnection(connection, daemon, staleAddressDetector, newDaemon, parameters);
         } catch (DaemonException.ConnectException e) {
             staleAddressDetector.maybeStaleAddress(e);
             throw e;