Fix NIO heartbeat

Author: acogoluegnes

src/main/java/com/rabbitmq/client/impl/nio/NioLoop.java

@@ -73,7 +73,7 @@ public void run() {
 
                 for (SelectionKey selectionKey : selector.keys()) {
                     SocketChannelFrameHandlerState state = (SocketChannelFrameHandlerState) selectionKey.attachment();
-                    if (state.getConnection() != null && state.getConnection().getHeartbeat() > 0) {
+                    if (state.getConnection() != null && state.getHeartbeatNanoSeconds() > 0) {
                         long now = System.nanoTime();
                         if ((now - state.getLastActivity()) > state.getHeartbeatNanoSeconds() * 2) {
                             try {

src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandler.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.SocketException;
+import java.time.Duration;
 
 /**
  *
@@ -61,6 +62,9 @@ public int getPort() {
     @Override
     public void setTimeout(int timeoutMs) throws SocketException {
         state.getChannel().socket().setSoTimeout(timeoutMs);
+        if (state.getConnection() != null) {
+            state.setHeartbeat(Duration.ofSeconds(state.getConnection().getHeartbeat()));
+        }
     }
 
     @Override

src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java

@@ -43,7 +43,7 @@ public class SocketChannelFrameHandlerState {
     private final NioQueue writeQueue;
 
     private volatile AMQConnection connection;
-    private volatile long heartbeat;
+    private volatile long heartbeatNanoSeconds = -1;
 
     /** should be used only in the NIO read thread */
     private long lastActivity;
@@ -156,7 +156,10 @@ public AMQConnection getConnection() {
 
     public void setConnection(AMQConnection connection) {
         this.connection = connection;
-        this.heartbeat = Duration.ofSeconds(connection.getHeartbeat()).toNanos();
+    }
+
+    void setHeartbeat(Duration ht) {
+        this.heartbeatNanoSeconds = ht.toNanos();
     }
 
     public void setLastActivity(long lastActivity) {
@@ -168,7 +171,7 @@ public long getLastActivity() {
     }
 
     long getHeartbeatNanoSeconds() {
-        return this.heartbeat;
+        return this.heartbeatNanoSeconds;
     }
 
     void prepareForWriteSequence() {