Merge pull request #703 from xiangwangcheng/develop

Ranjan Dasgupta · web-flow · commit 5eaee6957b31 · 2020-04-15T11:56:22.000-05:00
fix the problem#680: connectComplete be triggered when connectionLost
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java b/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
@@ -465,7 +465,7 @@ private MqttToken handleOldTokens(MqttToken token, MqttException reason) {
 			// First the token that was related to the disconnect / shutdown may
 			// not be in the token table - temporarily add it if not
 			if (token != null) {
-				if (tokenStore.getToken(token.internalTok.getKey())==null) {
+				if (!token.isComplete() && tokenStore.getToken(token.internalTok.getKey())==null) {
 					tokenStore.saveToken(token, token.internalTok.getKey());
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ private MqttToken handleOldTokens(MqttToken token, MqttException reason) {`
`465`	`465`	`// First the token that was related to the disconnect / shutdown may`
`466`	`466`	`// not be in the token table - temporarily add it if not`
`467`	`467`	`if (token != null) {`
`468`		`- if (tokenStore.getToken(token.internalTok.getKey())==null) {`
	`468`	`+ if (!token.isComplete() && tokenStore.getToken(token.internalTok.getKey())==null) {`
`469`	`469`	`tokenStore.saveToken(token, token.internalTok.getKey());`
`470`	`470`	`}`
`471`	`471`	`}`