[pusbullet] Assing handler to local variable for proper flow analysis

openhab · Jun 21, 2019 · b9cba02 · b9cba02
1 parent f3c7b5c
commit b9cba02
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...ullet/src/main/java/org/openhab/binding/pushbullet/internal/action/PushbulletActions.java b/...ullet/src/main/java/org/openhab/binding/pushbullet/internal/action/PushbulletActions.java
@@ -52,13 +52,15 @@ public class PushbulletActions implements ThingActions {
             @ActionInput(name = "message", label = "@text/actionSendPushbulletNoteInputMessageLabel", description = "@text/actionSendPushbulletNoteInputMessageDesc") @Nullable String message) {
         logger.trace("sendPushbulletNote '{}', '{}', '{}'", recipient, title, message);
 
-        if (handler == null) {
+        // Use local variable so the SAT check can do proper flow analysis
+        PushbulletHandler localHandler = handler;
+
+        if (localHandler == null) {
             logger.warn("Pushbullet service Handler is null!");
             return false;
         }
 
-        // Ignore the SAT warning, we check for nullness just above this line.
-        return handler.sendPush(recipient, title, message, "note");
+        return localHandler.sendPush(recipient, title, message, "note");
     }
 
     public static boolean sendPushbulletNote(@Nullable ThingActions actions, @Nullable String recipient,
@@ -76,13 +78,15 @@ public static boolean sendPushbulletNote(@Nullable ThingActions actions, @Nullab
             @ActionInput(name = "message", label = "@text/actionSendPushbulletNoteInputMessageLabel", description = "@text/actionSendPushbulletNoteInputMessageDesc") @Nullable String message) {
         logger.trace("sendPushbulletNote '{}', '{}'", recipient, message);
 
-        if (handler == null) {
+        // Use local variable so the SAT check can do proper flow analysis
+        PushbulletHandler localHandler = handler;
+
+        if (localHandler == null) {
             logger.warn("Pushbullet service Handler is null!");
             return false;
         }
 
-        // Ignore the SAT warning, we check for nullness just above this line.
-        return handler.sendPush(recipient, message, "note");
+        return localHandler.sendPush(recipient, message, "note");
     }
 
     public static boolean sendPushbulletNote(@Nullable ThingActions actions, @Nullable String recipient,