Skip to content

Commit 4e0feae

Browse files
authored
Merge pull request #1870 from smartdevicelink/bugfix/issue_1869_npe_routerService
Fix NPE in SdlRouterService
2 parents effc79c + 9d7fff8 commit 4e0feae

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2939,6 +2939,9 @@ protected PacketWriteTask getNextTask(TransportType transportType) {
29392939
long currentPriority = -Long.MAX_VALUE, peekWeight;
29402940
synchronized (REGISTERED_APPS_LOCK) {
29412941
PacketWriteTask peekTask;
2942+
if (registeredApps == null) {
2943+
return null;
2944+
}
29422945
for (RegisteredApp app : registeredApps.values()) {
29432946
peekTask = app.peekNextTask(transportType);
29442947
if (peekTask != null) {

0 commit comments

Comments
 (0)