Merge pull request #196 from surmay/issue/194

jpwsutton · jpwsutton · commit c5d43ffaab1a · 2016-04-20T09:02:04.000+01:00
Fixes #194 - ignore shutdownConnection if ClientComms already closed
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
@@ -293,7 +293,7 @@ public void shutdownConnection(MqttToken token, MqttException reason) {
 		// This method could concurrently be invoked from many places only allow it
 		// to run once.
 		synchronized(conLock) {
-			if (stoppingComms || closePending) {
+			if (stoppingComms || closePending || isClosed()) {
 				return;
 			}
 			stoppingComms = true;

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public void shutdownConnection(MqttToken token, MqttException reason) {`
`293`	`293`	`// This method could concurrently be invoked from many places only allow it`
`294`	`294`	`// to run once.`
`295`	`295`	`synchronized(conLock) {`
`296`		`- if (stoppingComms \|\| closePending) {`
	`296`	`+ if (stoppingComms \|\| closePending \|\| isClosed()) {`
`297`	`297`	`return;`
`298`	`298`	`}`
`299`	`299`	`stoppingComms = true;`