Adding Null check in WebSocketReciever when attempting to join thread

jpwsutton · jpwsutton · commit adc1160c8a2f · 2017-08-25T14:23:08.000+01:00
Signed-off-by: James Sutton &lt;james.sutton@uk.ibm.com&gt;
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketReceiver.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketReceiver.java
@@ -78,7 +78,7 @@ public void stop() {
 
 			}
 		}
-		if(closed && !Thread.currentThread().equals(receiverThread)) {
+		if(closed && !Thread.currentThread().equals(receiverThread) && (receiverThread != null)) {
 			try {
 				// Wait for the thread to finish
 		        //This must not happen in the synchronized block, otherwise we can deadlock ourselves!

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void stop() {`
`78`	`78`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`- if(closed && !Thread.currentThread().equals(receiverThread)) {`
	`81`	`+ if(closed && !Thread.currentThread().equals(receiverThread) && (receiverThread != null)) {`
`82`	`82`	`try {`
`83`	`83`	`// Wait for the thread to finish`
`84`	`84`	`//This must not happen in the synchronized block, otherwise we can deadlock ourselves!`