Reflect the current value of the heartbeat interval in the connection state; after conn.close_ok, call setHeartbeat(0) rather than just setting _heartbeat = 0; and improve the heartbeat tests

Author: Matthew Sackman

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -351,6 +351,7 @@ public int getHeartbeat() {
     public void setHeartbeat(int heartbeat) {
         try {
             _heartbeatSender.setHeartbeat(heartbeat);
+            _heartbeat = heartbeat;
 
             // Divide by four to make the maximum unwanted delay in
             // sending a timeout be less than a quarter of the
@@ -540,7 +541,7 @@ public void handleConnectionClose(Command closeCommand) {
         } catch (IOException ioe) {
             Utility.emptyStatement();
         }
-        _heartbeat = 0; // Do not try to send heartbeats after CloseOk
+        setHeartbeat(0); // Do not try to send heartbeats after CloseOk
         _brokerInitiatedShutdown = true;
         Thread scw = new SocketCloseWait(sse);
         scw.setName("AMQP Connection Closing Monitor " +

test/src/com/rabbitmq/client/test/functional/Heartbeat.java

@@ -47,9 +47,11 @@ public Heartbeat()
     public void testHeartbeat()
         throws IOException, InterruptedException
     {
+        assertEquals(1, connection.getHeartbeat());
         Thread.sleep(3100);
         assertTrue(connection.isOpen());
         ((AMQConnection)connection).setHeartbeat(0);
+        assertEquals(0, connection.getHeartbeat());
         Thread.sleep(3100);
         assertFalse(connection.isOpen());