From 2b06f17dacf87ab542383359eaed16ced64587e5 Mon Sep 17 00:00:00 2001
From: Tuan Nguyen <tnguy238@ford.com>
Date: Tue, 11 Jul 2017 15:54:24 -0700
Subject: #555 Perform null check on localRouterClass

---
 .../main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 6a5cda6b7..da956e7ff 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -75,7 +75,9 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
         }
         
 	    boolean didStart = false;
-	    localRouterClass = defineLocalSdlRouterClass();
+	    if ((localRouterClass = defineLocalSdlRouterClass()) == null) {
+			return;
+		}
         
 		//This will only be true if we are being told to reopen our SDL service because SDL is enabled
 		if(action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION)){ 
-- 
cgit v1.2.1