summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2018-09-17 17:06:54 -0400
committerJoey Grover <joeygrover@gmail.com>2018-09-17 17:06:54 -0400
commita432169e3d3d38dc31d9bbe216404e6b589e74d6 (patch)
treec07dd3ae41f3d38aecb78d330f3ec9941963ca02
parent962b99a3f2380cfbabaa157c41cf7af68191619f (diff)
downloadsdl_android-a432169e3d3d38dc31d9bbe216404e6b589e74d6.tar.gz
Fix potential NPE while checking activeTransports
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 722e14cc6..d8a8de86f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -632,7 +632,9 @@ public class SdlProtocol {
continue;
}
- if(activeTransports.get(serviceType).getType().equals(secondaryTransportType)){
+ if(activeTransports.get(serviceType) != null
+ && activeTransports.get(serviceType).getType() !=null
+ && activeTransports.get(serviceType).getType().equals(secondaryTransportType)){
// Transport is already active and accepted
header.setTransportRecord(activeTransports.get(serviceType));
handlePacketToSend(header);