Merge branch 'develop' of github.com:eclipse/paho.mqtt.java into develop

jpwsutton · jpwsutton · commit 89066be9394f · 2018-05-23T09:51:26.000+01:00
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java
@@ -320,8 +320,8 @@ public int getMaxReconnectDelay() {
 	 * Set the maximum time to wait between reconnects
 	 * @param maxReconnectDelay the duration (in millis)
 	*/
-	public void setMaxReconnectDelay(int macReconnectDelay) {
-		this.maxReconnectDelay = macReconnectDelay;
+	public void setMaxReconnectDelay(int maxReconnectDelay) {
+		this.maxReconnectDelay = maxReconnectDelay;
 	}
 
 
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java
@@ -1317,7 +1317,7 @@ protected void notifyComplete(MqttToken token) throws MqttException {
 	 * Updates a token with the latest reason codes, currently only used for PubRec
 	 * messages.
 	 * 
-	 * @param msg
+	 * @param ack
 	 *            - The message that we are using for the update
 	 * @param token
 	 *            - The Token we are updating

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,8 @@ public int getMaxReconnectDelay() {`
`320`	`320`	`* Set the maximum time to wait between reconnects`
`321`	`321`	`* @param maxReconnectDelay the duration (in millis)`
`322`	`322`	`*/`
`323`		`- public void setMaxReconnectDelay(int macReconnectDelay) {`
`324`		`- this.maxReconnectDelay = macReconnectDelay;`
	`323`	`+ public void setMaxReconnectDelay(int maxReconnectDelay) {`
	`324`	`+ this.maxReconnectDelay = maxReconnectDelay;`
`325`	`325`	`}`
`326`	`326`
`327`	`327`
Original file line number	Diff line number	Diff line change
`@@ -1317,7 +1317,7 @@ protected void notifyComplete(MqttToken token) throws MqttException {`
`1317`	`1317`	`* Updates a token with the latest reason codes, currently only used for PubRec`
`1318`	`1318`	`* messages.`
`1319`	`1319`	`*`
`1320`		`- * @param msg`
	`1320`	`+ * @param ack`
`1321`	`1321`	`* - The message that we are using for the update`
`1322`	`1322`	`* @param token`
`1323`	`1323`	`* - The Token we are updating`