Merge pull request #229 from jpwsutton/develop

Persisted Buffered Message fix issue #224

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -160,7 +160,9 @@ public void sendNoWait(MqttWireMessage message, MqttToken token) throws MqttExce
 		} else if(disconnectedMessageBuffer != null && isResting()){
 			//@TRACE 508=Client Resting, Offline Buffer available. Adding message to buffer. message={0}
 			log.fine(CLASS_NAME, methodName, "508", new Object[] {message.getKey()});
-			this.clientState.persistBufferedMessage(message);
+			if(disconnectedMessageBuffer.isPersistBuffer()){
+				this.clientState.persistBufferedMessage(message);
+			}
 			disconnectedMessageBuffer.putMessage(message, token);
 		} else {
 			//@TRACE 208=failed: not connected

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

@@ -1090,6 +1090,7 @@ protected void notifyComplete(MqttToken token) throws MqttException {
 
 				// QoS 1 - user notified now remove from persistence...
 				persistence.remove(getSendPersistenceKey(message));
+				persistence.remove(getSendBufferedPersistenceKey(message));
 				outboundQoS1.remove(new Integer(ack.getMessageId()));
 				decrementInFlight();
 				releaseMessageId(message.getMessageId());
@@ -1101,6 +1102,7 @@ protected void notifyComplete(MqttToken token) throws MqttException {
 				// QoS 2 - user notified now remove from persistence...
 				persistence.remove(getSendPersistenceKey(message));
 				persistence.remove(getSendConfirmPersistenceKey(message));
+				persistence.remove(getSendBufferedPersistenceKey(message));
 				outboundQoS2.remove(new Integer(ack.getMessageId()));
 
 				inFlightPubRels--;