Issue #358 - Adding a Message ID for appropriate message types

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/internal/ClientState.java

@@ -46,6 +46,9 @@
 import org.eclipse.paho.client.mqttv3.internal.wire.MqttPubRel;
 import org.eclipse.paho.client.mqttv3.internal.wire.MqttPublish;
 import org.eclipse.paho.client.mqttv3.internal.wire.MqttSuback;
+import org.eclipse.paho.client.mqttv3.internal.wire.MqttSubscribe;
+import org.eclipse.paho.client.mqttv3.internal.wire.MqttUnsubAck;
+import org.eclipse.paho.client.mqttv3.internal.wire.MqttUnsubscribe;
 import org.eclipse.paho.client.mqttv3.internal.wire.MqttWireMessage;
 import org.eclipse.paho.client.mqttv3.logging.Logger;
 import org.eclipse.paho.client.mqttv3.logging.LoggerFactory;
@@ -482,7 +485,16 @@ public void send(MqttWireMessage message, MqttToken token) throws MqttException
 		if (message.isMessageIdRequired() && (message.getMessageId() == 0)) {
 				if(message instanceof MqttPublish  && (((MqttPublish) message).getMessage().getQos() != 0)){
 						message.setMessageId(getNextMessageId());
-				} 
+				}else if(message instanceof MqttPubAck ||
+						message instanceof MqttPubRec ||
+						message instanceof MqttPubRel ||
+						message instanceof MqttPubComp ||
+						message instanceof MqttSubscribe ||
+						message instanceof MqttSuback ||
+						message instanceof MqttUnsubscribe || 
+						message instanceof MqttUnsubAck){
+					message.setMessageId(getNextMessageId());
+				}
 		}
 		if (token != null ) {
 			try {