Merge pull request #588 from chongyuanyin/develop

Fix issues on Maximum QoS and Receive Maximum properties for MQTT 5.0

Author: icraggs

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java

@@ -53,6 +53,9 @@ public void clearConnectionState() {
 
 
 	public Integer getReceiveMaximum() {
+		if (receiveMaximum == null) {
+			return 65535;
+		}
 		return receiveMaximum;
 	}
 

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java

@@ -336,7 +336,7 @@ public byte[] encodeProperties() throws MqttException {
 			// Maximum QoS
 			if (maximumQoS != null && validProperties.contains(MAXIMUM_QOS_IDENTIFIER)) {
 				outputStream.write(MAXIMUM_QOS_IDENTIFIER);
-				outputStream.writeShort(maximumQoS);
+				outputStream.writeByte(maximumQoS);
 			}
 
 			// Retain Available
@@ -476,7 +476,7 @@ public void decodeProperties(DataInputStream dis) throws IOException, MqttExcept
 					} else if (identifier == TOPIC_ALIAS_IDENTIFIER) {
 						topicAlias = (int) inputStream.readShort();
 					} else if (identifier == MAXIMUM_QOS_IDENTIFIER) {
-						maximumQoS = (int) inputStream.readShort();
+						maximumQoS = inputStream.read();
 					} else if (identifier == RETAIN_AVAILABLE_IDENTIFIER) {
 						retainAvailable = inputStream.readBoolean();
 					} else if (identifier == USER_DEFINED_PAIR_IDENTIFIER) {