Undoing keepalive change from yesterday, adding disable proxy to v5 offline buffering tests

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/connectionLoss/ConnectionLossTest.java

@@ -33,6 +33,7 @@
 import org.eclipse.paho.client.mqttv3.test.properties.TestProperties;
 import org.eclipse.paho.client.mqttv3.test.utilities.ConnectionManipulationProxyServer;
 import org.eclipse.paho.client.mqttv3.test.utilities.Utility;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -90,8 +91,14 @@ public static void setUpBeforeClass() throws Exception{
 	public static void tearDownAfterClass() throws Exception {
 		log.info("Tests finished, stopping proxy");
 		proxy.stopProxy();
-		
 	}
+	
+	@After
+	public void afterTest() {
+		log.info("Disabling Proxy");
+		proxy.disableProxy();
+	}
+	
 	/**
 	 * Tests whether paho can detect a connection loss with the server even if it has outbound activity by publishing messages with QoS 0.
 	 * @throws Exception

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/ClientState.java

@@ -774,15 +774,15 @@ public MqttToken checkForActivity(IMqttActionListener pingCallback) throws MqttE
                     tokenStore.saveToken(token, pingCommand);
                     pendingFlows.insertElementAt(pingCommand, 0);
 
-                    nextPingTime = this.keepAlive;
+                    nextPingTime = getKeepAlive();
 
                     //Wake sender thread since it may be in wait state (in ClientState.get())                                                                                                                             
                     notifyQueueLock();
                 }
                 else {
                 		//@TRACE 634=ping not needed yet. Schedule next ping.
                     log.fine(CLASS_NAME, methodName, "634", null);
-                    nextPingTime = Math.max(1, this.keepAlive - (time - lastOutboundActivity));
+                    nextPingTime = Math.max(1,  getKeepAlive() - (time - lastOutboundActivity));
                 }
             }
             //@TRACE 624=Schedule next ping at {0}                                                                                                                                                                                

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/automaticReconnect/OfflineBufferingTest.java

@@ -24,6 +24,7 @@
 import org.eclipse.paho.mqttv5.common.MqttMessage;
 import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
 import org.eclipse.paho.mqttv5.common.packet.MqttPublish;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -63,6 +64,12 @@ public static void setUpBeforeClass() throws Exception {
 		}
 
 	}
+	
+	@After
+	public void clearUpAfterTest() {
+		proxy.disableProxy();
+	}
+
 
 	/**
 	 * Tests that A message can be buffered whilst the client is in a