REflecting modifications of 15883_1

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
openhab · Apr 28, 2024 · 76049ed · 76049ed
1 parent 002744c
commit 76049ed
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...n/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java b/...n/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java
@@ -15,7 +15,6 @@
 import static org.openhab.binding.netatmo.internal.NetatmoBindingConstants.*;
 import static org.openhab.binding.netatmo.internal.utils.ChannelTypeUtils.*;
 
-import java.util.Objects;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -51,8 +50,8 @@ public void setModuleType(ModuleType moduleType) {
     }
 
     public void setUrls(String vpnUrl, @Nullable String localUrl) {
-        this.vpnUrl = vpnUrl;
         this.localUrl = localUrl;
+        this.vpnUrl = vpnUrl;
     }
 
     @Override
@@ -92,8 +91,8 @@ public void setNewData(@Nullable NAObject data) {
         };
     }
 
-    private String getUrl(boolean local) {
-        return Objects.requireNonNull(local ? localUrl : vpnUrl);
+    private @Nullable String getUrl(boolean local) {
+        return local ? localUrl : vpnUrl;
     }
 
     private State getStreamURL(boolean local, @Nullable String videoId, VideoStatus videoStatus) {