[tellstick] Fix for NPE (openhab#10377)

Signed-off-by: Jan Gustafsson <jannegpriv@gmail.com>
jannegpriv · Mar 22, 2021 · 98d02c2 · 98d02c2
1 parent c709f52
commit 98d02c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...k/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveBridgeHandler.java b/...k/src/main/java/org/openhab/binding/tellstick/internal/live/TelldusLiveBridgeHandler.java
@@ -128,8 +128,8 @@ synchronized void refreshDeviceList() {
     private synchronized void updateDevices(TellstickNetDevices previouslist) throws TellstickException {
         TellstickNetDevices newList = controller.callRestMethod(TelldusLiveDeviceController.HTTP_TELLDUS_DEVICES,
                 TellstickNetDevices.class);
-        logger.debug("Device list {}", newList.getDevices());
         if (newList.getDevices() != null) {
+            logger.debug("Device list {}", newList.getDevices());
             if (previouslist == null) {
                 logger.debug("updateDevices, Creating devices.");
                 for (TellstickNetDevice device : newList.getDevices()) {
@@ -172,6 +172,8 @@ private synchronized void updateDevices(TellstickNetDevices previouslist) throws
                     device.setUpdated(false);
                 }
             }
+        } else {
+            logger.debug("updateDevices, rest API returned null");
         }
     }
 

diff --git a/...src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalBridgeHandler.java b/...src/main/java/org/openhab/binding/tellstick/internal/local/TelldusLocalBridgeHandler.java
@@ -111,8 +111,8 @@ private synchronized void updateDevices(TellstickLocalDevicesDTO previouslist)
             throws TellstickException, InterruptedException {
         TellstickLocalDevicesDTO newList = controller
                 .callRestMethod(TelldusLocalDeviceController.HTTP_LOCAL_API_DEVICES, TellstickLocalDevicesDTO.class);
-        logger.debug("Device list {}", newList.getDevices());
         if (newList.getDevices() != null) {
+            logger.debug("Device list {}", newList.getDevices());
             if (previouslist == null) {
                 for (TellstickLocalDeviceDTO device : newList.getDevices()) {
                     device.setUpdated(true);
@@ -158,6 +158,8 @@ private synchronized void updateDevices(TellstickLocalDevicesDTO previouslist)
                     device.setUpdated(false);
                 }
             }
+        } else {
+            logger.debug("updateDevices, rest API returned null");
         }
     }