Merge "Fix Bug 444968 - Trace logs for Paho SUBSCRIBE show the topic, but the QoS is hard to identify in there" into develop

Author: Al Stockdill-Mander

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

@@ -703,13 +703,12 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
 			if (i>0) {
 				subs+=", ";
 			}
-			subs+=topicFilters[i]+":"+qos[i];
+			subs+= "topic="+ topicFilters[i]+" qos="+qos[i];
 
 			//Check if the topic filter is valid before subscribing
 			MqttTopic.validate(topicFilters[i], true/*allow wildcards*/);
 		}
-		
-		//@TRACE 106=Subscribe topic={0} userContext={1} callback={2}
+		//@TRACE 106=Subscribe topicFilter={0} userContext={1} callback={2}
 		log.fine(CLASS_NAME,methodName,"106",new Object[]{subs, userContext, callback});
 
 		MqttToken token = new MqttToken(getClientId());

org.eclipse.paho.client.mqttv3/src/main/resources/org/eclipse/paho/client/mqttv3/internal/nls/logcat.properties

@@ -129,7 +129,7 @@
 104=> quiesceTimeout={0} userContext={1} callback={2}
 105=< exception
 108=<
-106=Subscribe topic={0} userContext={1} callback={2}
+106=Subscribe topicFilter={0} userContext={1} callback={2}
 109=<
 107=Unsubscribe topic={0} userContext={1} callback={2}
 110=<