summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen, Tuan (T.N.) <tnguy238@ford.com>2017-05-08 08:27:23 -0700
committerTuan Nguyen <tnguy238@ford.com>2017-05-24 09:18:06 -0700
commit5ab98b8b0c23c8949e97b4bb47060475da3899bf (patch)
tree2a3752d51f7ea738152caa656899b5795e81601f
parent27d9dc3647cfa0ee2d583328d7154603a0047fa3 (diff)
downloadsdl_android-5ab98b8b0c23c8949e97b4bb47060475da3899bf.tar.gz
#464 Access bundle inside null check
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index 2bae96e27..1da9ca7f6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -609,19 +609,19 @@ public class SdlRouterService extends Service{
case TransportConstants.ROUTER_RECEIVED_PACKET:
if(receivedBundle!=null){
receivedBundle.setClassLoader(loader);//We do this because loading a custom parceable object isn't possible without it
+ if(receivedBundle.containsKey(TransportConstants.FORMED_PACKET_EXTRA_NAME)){
+ SdlPacket packet = receivedBundle.getParcelable(TransportConstants.FORMED_PACKET_EXTRA_NAME);
+ if(packet!=null){
+ service.onPacketRead(packet);
+ }else{
+ Log.w(TAG, "Received null packet from alt transport service");
+ }
+ }else{
+ Log.w(TAG, "Flase positive packet reception");
+ }
}else{
Log.e(TAG, "Bundle was null while sending packet to router service from alt transport");
}
- if(receivedBundle.containsKey(TransportConstants.FORMED_PACKET_EXTRA_NAME)){
- SdlPacket packet = receivedBundle.getParcelable(TransportConstants.FORMED_PACKET_EXTRA_NAME);
- if(packet!=null){
- service.onPacketRead(packet);
- }else{
- Log.w(TAG, "Received null packet from alt transport service");
- }
- }else{
- Log.w(TAG, "Flase positive packet reception");
- }
break;
default:
super.handleMessage(msg);