summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2016-11-18 11:05:40 -0500
committerJoey Grover <joeygrover@gmail.com>2016-11-18 11:06:49 -0500
commitcf2c091dc5974a7fda23b9f2fdd5898e92d7290c (patch)
tree0ab15956623fdc1bb7c840cbbd2849bc6a2b79ab
parenta0e086594ccb5d4440696e4b492223593f4989c9 (diff)
downloadsdl_android-cf2c091dc5974a7fda23b9f2fdd5898e92d7290c.tar.gz
Make WeakReferences final objects to avoid checking for null
-rw-r--r--sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java12
-rw-r--r--sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java4
2 files changed, 8 insertions, 8 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
index d5a766b64..608855631 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
@@ -320,7 +320,7 @@ public class SdlRouterService extends Service{
* Handler of incoming messages from clients.
*/
static class RouterHandler extends Handler {
- WeakReference<SdlRouterService> provider;
+ final WeakReference<SdlRouterService> provider;
public RouterHandler(SdlRouterService provider){
this.provider = new WeakReference<SdlRouterService>(provider);
@@ -328,7 +328,7 @@ public class SdlRouterService extends Service{
@Override
public void handleMessage(Message msg) {
- if(this.provider == null || this.provider.get() == null){
+ if(this.provider.get() == null){
return;
}
final Bundle receivedBundle = msg.getData();
@@ -546,7 +546,7 @@ public class SdlRouterService extends Service{
*/
static class AltTransportHandler extends Handler {
ClassLoader loader;
- WeakReference<SdlRouterService> provider;
+ final WeakReference<SdlRouterService> provider;
public AltTransportHandler(SdlRouterService provider){
this.provider = new WeakReference<SdlRouterService>(provider);
@@ -555,7 +555,7 @@ public class SdlRouterService extends Service{
@Override
public void handleMessage(Message msg) {
- if(this.provider == null || this.provider.get() == null){
+ if(this.provider.get() == null){
return;
}
SdlRouterService service = this.provider.get();
@@ -632,7 +632,7 @@ public class SdlRouterService extends Service{
* Handler of incoming messages from an alternative transport (USB).
*/
static class RouterStatusHandler extends Handler {
- WeakReference<SdlRouterService> provider;
+ final WeakReference<SdlRouterService> provider;
public RouterStatusHandler(SdlRouterService provider){
this.provider = new WeakReference<SdlRouterService>(provider);
@@ -640,7 +640,7 @@ public class SdlRouterService extends Service{
@Override
public void handleMessage(Message msg) {
- if(this.provider == null || this.provider.get() == null){
+ if(this.provider.get() == null){
return;
}
SdlRouterService service = this.provider.get();
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 540554ffe..916b414d3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
@@ -125,7 +125,7 @@ public class SdlRouterStatusProvider {
}
static class ClientHandler extends Handler {
- WeakReference<SdlRouterStatusProvider> provider;
+ final WeakReference<SdlRouterStatusProvider> provider;
public ClientHandler(SdlRouterStatusProvider provider){
this.provider = new WeakReference<SdlRouterStatusProvider>(provider);
@@ -133,7 +133,7 @@ public class SdlRouterStatusProvider {
@Override
public void handleMessage(Message msg) {
- if(provider == null || provider.get()==null){
+ if(provider.get()==null){
return;
}
switch (msg.what) {