Adding Null check in WebSocketReciever when attempting to join thread

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
eclipse · Aug 25, 2017 · adc1160 · adc1160
1 parent 783802c
commit adc1160
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...v3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketReceiver.java b/...v3/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!