Skip to content

Commit fe771c0

Browse files
authored
Merge pull request #13 from hannesa2/null_on_subscribe_return
Subscribe should not return null
2 parents 3c3f2a0 + 5a2c23e commit fe771c0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
962962
String activityToken = storeToken(token);
963963
mqttService.subscribe(clientHandle, topicFilters, qos, null, activityToken, messageListeners);
964964

965-
return null;
965+
return token;
966966
}
967967

968968
/**

org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ public void subscribe(String[] topicFilters, int[] qos, String invocationContext
588588
if ((myClient != null) && (myClient.isConnected())) {
589589
IMqttActionListener listener = new MqttConnectionListener(resultBundle);
590590
try {
591-
myClient.subscribe(topicFilters, qos, messageListeners);
591+
myClient.subscribe(topicFilters, qos, null, listener,messageListeners);
592592
} catch (Exception e) {
593593
handleException(resultBundle, e);
594594
}

0 commit comments

Comments
 (0)