Merge pull request #92 from sathipal/master

Fix NPE in terminate call
ibm-watson-iot · Apr 6, 2017 · 450dc69 · 450dc69
2 parents 8c70661 + 6ca9975
commit 450dc69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/ibm/iotf/devicemgmt/device/ManagedDevice.java b/src/main/java/com/ibm/iotf/devicemgmt/device/ManagedDevice.java
@@ -1025,7 +1025,9 @@ public void run() {
 	private void terminate() {
 		running = false;
 		try {
-			publishQueue.put(dummy);
+			if(publishQueue != null) {
+				publishQueue.put(dummy);
+			}
 		} catch (InterruptedException e) {
 		}
 	}

diff --git a/src/main/java/com/ibm/iotf/devicemgmt/gateway/ManagedGateway.java b/src/main/java/com/ibm/iotf/devicemgmt/gateway/ManagedGateway.java
@@ -1599,7 +1599,9 @@ public void run() {
 	private void terminate() {
 		running = false;
 		try {
-			publishQueue.put(dummy);
+			if(null != publishQueue) {
+				publishQueue.put(dummy);
+			}
 		} catch (InterruptedException e) {
 		}
 	}