Fixing bug where message IDs would be given to QoS 0 messages

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

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java

@@ -1307,6 +1307,17 @@ public MqttMessage getBufferedMessage(int bufferIndex){
 	public void deleteBufferedMessage(int bufferIndex){
 		this.comms.deleteBufferedMessage(bufferIndex);
 	}
+	
+	/**
+	 * Returns the current number of outgoing in-flight messages
+	 * being sent by the client. Note that this number cannot be
+	 * guaranteed to be 100% accurate as some messages may have
+	 * been sent or queued in the time taken for this method to return.
+	 * @return the current number of in-flight messages.
+	 */
+	public int getInFlightMessageCount(){
+		return this.comms.getActualInFlight();
+	}
 
 
 

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

@@ -480,7 +480,9 @@ private void restoreInflightMessages() {
 	public void send(MqttWireMessage message, MqttToken token) throws MqttException {
 		final String methodName = "send";
 		if (message.isMessageIdRequired() && (message.getMessageId() == 0)) {
-			message.setMessageId(getNextMessageId());
+				if(message instanceof MqttPublish  && (((MqttPublish) message).getMessage().getQos() != 0)){
+						message.setMessageId(getNextMessageId());
+				} 
 		}
 		if (token != null ) {
 			try {