Skip to content

Commit 2632859

Browse files
Fix some potential NPEs when session is null
1 parent 039503d commit 2632859

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ abstract class BaseLifecycleManager {
151151

152152
public void start() {
153153
try {
154-
session.startSession();
154+
if (session != null) {
155+
session.startSession();
156+
}
155157
} catch (SdlException e) {
156158
DebugTool.logError(TAG,"Error attempting to start session", e);
157159
}
@@ -868,7 +870,9 @@ private void sendRPCMessagePrivate(RPCMessage message, boolean isInternalMessage
868870
pm.setPriorityCoefficient(1);
869871
}
870872

871-
session.sendMessage(pm);
873+
if (session != null) {
874+
session.sendMessage(pm);
875+
}
872876

873877
} catch (OutOfMemoryError e) {
874878
DebugTool.logError(TAG,"Error attempting to send RPC message.", e);

0 commit comments

Comments
 (0)