Merge pull request #887 from AnkurSen-github/Fix_Recursive_call_issue

Fix StackOverflow in MQTTv5 MqttClient and resulting IOOBE in MqttAsyncClient

Author: Ranjan Dasgupta

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

@@ -1273,8 +1273,12 @@ public IMqttToken subscribe(MqttSubscription[] subscriptions, Object userContext
 	public IMqttToken subscribe(MqttSubscription[] subscriptions, Object userContext, MqttActionListener callback,
 			IMqttMessageListener messageListener, MqttProperties subscriptionProperties) throws MqttException {
 
-		int subId = subscriptionProperties.getSubscriptionIdentifiers().get(0);
-
+		int subId = 0;
+		try {
+			subId = subscriptionProperties.getSubscriptionIdentifiers().get(0);
+		} catch (IndexOutOfBoundsException e) {
+			log.fine(CLASS_NAME, "subscribe", "No sub subscription property(s)");
+		}
 		// Automatic Subscription Identifier Assignment is enabled
 		if (connOpts.useSubscriptionIdentifiers() && this.mqttConnection.isSubscriptionIdentifiersAvailable()) {
 

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttClient.java

@@ -516,8 +516,13 @@ public IMqttToken subscribe(MqttSubscription[] subscriptions) throws MqttExcepti
 	 * @see org.eclipse.paho.mqttv5.client.IMqttClient#subscribe(java.lang.String,
 	 * int)
 	 */
-	public IMqttToken subscribe(String topicFilter, int qos, IMqttMessageListener messageListener) throws MqttException {
-		return this.subscribe(new String[] { topicFilter }, new int[] { qos }, new IMqttMessageListener[] { messageListener });
+	public IMqttToken subscribe(String topicFilter, int qos, IMqttMessageListener messageListener)
+			throws MqttException {
+		MqttSubscription subscription = new MqttSubscription(topicFilter);
+		subscription.setQos(qos);
+		IMqttToken token = aClient.subscribe(subscription, messageListener);
+		token.waitForCompletion();
+		return token;
 	}
 
 	public IMqttToken subscribe(String[] topicFilters, int[] qos, IMqttMessageListener[] messageListeners)