Skip to content

Commit d5a1efb

Browse files
Fix potential NPE
1 parent 2138ec7 commit d5a1efb

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,12 @@ void cycleProxy(SdlDisconnectedReason disconnectedReason) {
120120
//We don't want to alert higher if we are just cycling for legacy bluetooth
121121
onClose("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);
122122
}
123-
try {
124-
session.startSession();
125-
} catch (SdlException e) {
126-
e.printStackTrace();
123+
if (session != null) {
124+
try {
125+
session.startSession();
126+
} catch (SdlException e) {
127+
e.printStackTrace();
128+
}
127129
}
128130
}
129131

javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ void initializeProxy() {
5757

5858
@Override
5959
void cycleProxy(SdlDisconnectedReason disconnectedReason) {
60+
cleanProxy();
6061
if (session != null) {
61-
if (session.getIsConnected()) {
62-
session.close();
63-
}
6462
try {
6563
session.startSession();
6664
} catch (SdlException e) {

0 commit comments

Comments
 (0)