Issue #539 - MQTTv5 - Handling Retain, Wildcard, SubId, Shared Sub Av…

…ailable flags in properties correctly.

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

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

@@ -125,10 +125,10 @@ public class MqttProperties {
 	private Boolean requestProblemInfo;
 	private Boolean requestResponseInfo;
 	private Integer maximumQoS;
-	private Boolean retainAvailable;
-	private Boolean wildcardSubscriptionsAvailable = false;
-	private Boolean subscriptionIdentifiersAvailable = false;
-	private Boolean sharedSubscriptionAvailable = false;
+	private Boolean retainAvailable = null;
+	private Boolean wildcardSubscriptionsAvailable = null;
+	private Boolean subscriptionIdentifiersAvailable = null;
+	private Boolean sharedSubscriptionAvailable = null;
 
 	// Two Byte Integer
 	private Integer serverKeepAlive;
@@ -341,6 +341,7 @@ public byte[] encodeProperties() throws MqttException {
 			// Retain Available
 			if (retainAvailable != null && validProperties.contains(RETAIN_AVAILABLE_IDENTIFIER)) {
 				outputStream.write(RETAIN_AVAILABLE_IDENTIFIER);
+				outputStream.writeBoolean(retainAvailable);
 			}
 
 			// User Defined Properties
@@ -363,18 +364,21 @@ public byte[] encodeProperties() throws MqttException {
 			// Wildcard Subscription Available flag
 			if (wildcardSubscriptionsAvailable != null && validProperties.contains(WILDCARD_SUB_AVAILABLE_IDENTIFIER)) {
 				outputStream.write(WILDCARD_SUB_AVAILABLE_IDENTIFIER);
+				outputStream.writeBoolean(wildcardSubscriptionsAvailable);
 			}
 
 			// Subscription Identifiers Available flag
 			if (subscriptionIdentifiersAvailable != null
 					&& validProperties.contains(SUBSCRIPTION_AVAILABLE_IDENTIFIER)) {
 				outputStream.write(SUBSCRIPTION_AVAILABLE_IDENTIFIER);
+				outputStream.writeBoolean(subscriptionIdentifiersAvailable);
 			}
 
 			// Shared Subscription Available flag
 			if (sharedSubscriptionAvailable != null
 					&& validProperties.contains(SHARED_SUBSCRIPTION_AVAILABLE_IDENTIFIER)) {
 				outputStream.write(SHARED_SUBSCRIPTION_AVAILABLE_IDENTIFIER);
+				outputStream.writeBoolean(sharedSubscriptionAvailable);
 			}
 
 			int length = outputStream.size();
@@ -464,19 +468,19 @@ public void decodeProperties(DataInputStream dis) throws IOException, MqttExcept
 					} else if (identifier == MAXIMUM_QOS_IDENTIFIER) {
 						maximumQoS = (int) inputStream.readShort();
 					} else if (identifier == RETAIN_AVAILABLE_IDENTIFIER) {
-						retainAvailable = true;
+						retainAvailable = inputStream.readBoolean();
 					} else if (identifier == USER_DEFINED_PAIR_IDENTIFIER) {
 						String key = MqttDataTypes.decodeUTF8(inputStream);
 						String value = MqttDataTypes.decodeUTF8(inputStream);
 						userProperties.add(new UserProperty(key, value));
 					} else if (identifier == MAXIMUM_PACKET_SIZE_IDENTIFIER) {
 						maximumPacketSize = MqttDataTypes.readUnsignedFourByteInt(inputStream);
 					} else if (identifier == WILDCARD_SUB_AVAILABLE_IDENTIFIER) {
-						wildcardSubscriptionsAvailable = true;
+						wildcardSubscriptionsAvailable = inputStream.readBoolean();
 					} else if (identifier == SUBSCRIPTION_AVAILABLE_IDENTIFIER) {
-						subscriptionIdentifiersAvailable = true;
+						subscriptionIdentifiersAvailable = inputStream.readBoolean();
 					} else if (identifier == SHARED_SUBSCRIPTION_AVAILABLE_IDENTIFIER) {
-						sharedSubscriptionAvailable = true;
+						sharedSubscriptionAvailable = inputStream.readBoolean();
 					} else {
 
 						// Unidentified Identifier
@@ -715,7 +719,11 @@ public void setMaximumPacketSize(Long maximumPacketSize) {
 	 * @return Retain Available Flag. May be Null.
 	 */
 	public Boolean isRetainAvailable() {
-		return retainAvailable;
+		if(retainAvailable == null || retainAvailable == true) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -912,7 +920,11 @@ public void setServerReference(String serverReference) {
 	 * @return A boolean defining whether Wildcard Subscriptions are supported.
 	 */
 	public boolean isWildcardSubscriptionsAvailable() {
-		return wildcardSubscriptionsAvailable;
+		if(wildcardSubscriptionsAvailable == null || wildcardSubscriptionsAvailable == true) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -940,7 +952,11 @@ public void setWildcardSubscriptionsAvailable(boolean wildcardSubscriptionsAvail
 	 * @return A boolean defining whether Subscription Identifiers are supported.
 	 */
 	public boolean isSubscriptionIdentifiersAvailable() {
-		return subscriptionIdentifiersAvailable;
+		if(subscriptionIdentifiersAvailable == null || subscriptionIdentifiersAvailable == true) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -967,7 +983,11 @@ public void setSubscriptionIdentifiersAvailable(boolean subscriptionIdentifiersA
 	 * @return A boolean defining whether Shared Subscriptions are supported.
 	 */
 	public boolean isSharedSubscriptionAvailable() {
-		return sharedSubscriptionAvailable;
+		if(sharedSubscriptionAvailable == null || sharedSubscriptionAvailable == true) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**