Null check on Pending Intent In AlarmPingSender

astri-isns · Dec 8, 2016 · 66eea50 · 66eea50
1 parent 6579bf4
commit 66eea50
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/....paho.android.service/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java b/....paho.android.service/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java
@@ -85,9 +85,11 @@ public void stop() {
 
 		Log.d(TAG, "Unregister alarmreceiver to MqttService"+comms.getClient().getClientId());
 		if(hasStarted){
-			// Cancel Alarm.
-			AlarmManager alarmManager = (AlarmManager) service.getSystemService(Service.ALARM_SERVICE);
-			alarmManager.cancel(pendingIntent);
+			if(pendingIntent != null){
+				// Cancel Alarm.
+				AlarmManager alarmManager = (AlarmManager) service.getSystemService(Service.ALARM_SERVICE);
+				alarmManager.cancel(pendingIntent);
+			}
 
 			hasStarted = false;
 			try{