Add transportManager NPE check in SdlProtocolBasefeature/sdl_protocol_npe

1 files changed, 18 insertions, 14 deletions

diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index f886dbd16..929e2873a 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -779,20 +779,24 @@ public class SdlProtocolBase {
                     }
                 };
 
-                if(transportManager.isConnected(secondaryTransportType,null)){
-                    //The transport is actually connected, however no service has been registered
-                    listenerList.add(secondaryListener);
-                    registerSecondaryTransport(sessionID,transportManager.getTransportRecord(secondaryTransportType,null));
-                }else if(secondaryTransportParams != null && secondaryTransportParams.containsKey(secondaryTransportType)) {
-                    //No acceptable secondary transport is connected, so first one must be connected
-                    header.setTransportRecord(new TransportRecord(secondaryTransportType,""));
-                    listenerList.add(secondaryListener);
-                    transportManager.requestSecondaryTransportConnection(sessionID,secondaryTransportParams.get(secondaryTransportType));
-                }else{
-                    Log.w(TAG, "No params to connect to secondary transport");
-                    //Unable to register or start a secondary connection. Use the callback in case
-                    //there is a chance to use the primary transport for this service.
-                    secondaryListener.onConnectionFailure();
+                if (transportManager != null) {
+                    if (transportManager.isConnected(secondaryTransportType, null)) {
+                        //The transport is actually connected, however no service has been registered
+                        listenerList.add(secondaryListener);
+                        registerSecondaryTransport(sessionID, transportManager.getTransportRecord(secondaryTransportType, null));
+                    } else if (secondaryTransportParams != null && secondaryTransportParams.containsKey(secondaryTransportType)) {
+                        //No acceptable secondary transport is connected, so first one must be connected
+                        header.setTransportRecord(new TransportRecord(secondaryTransportType, ""));
+                        listenerList.add(secondaryListener);
+                        transportManager.requestSecondaryTransportConnection(sessionID, secondaryTransportParams.get(secondaryTransportType));
+                    } else {
+                        Log.w(TAG, "No params to connect to secondary transport");
+                        //Unable to register or start a secondary connection. Use the callback in case
+                        //there is a chance to use the primary transport for this service.
+                        secondaryListener.onConnectionFailure();
+                    }
+                } else {
+                    Log.e(TAG, "transportManager is null");
                 }
 
             }