[icloud] Fix NPE in AccountBridgeHandler (openhab#7087)

* Fix NPE in AccountBridgeHandler Signed-off-by: Kristof Rado <rado.krisi@gmail.com> Signed-off-by: Hans-Reiner Hoffmann <hans-reiner.hoffmann@gmx.de>
Hans-Reiner · Apr 11, 2020 · 038b965 · 038b965
1 parent 9f79e0a
commit 038b965
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...loud/src/main/java/org/openhab/binding/icloud/internal/ICloudDeviceInformationParser.java b/...loud/src/main/java/org/openhab/binding/icloud/internal/ICloudDeviceInformationParser.java
@@ -13,6 +13,7 @@
 package org.openhab.binding.icloud.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.icloud.internal.json.response.ICloudAccountDataResponse;
 
 import com.google.gson.Gson;
@@ -29,7 +30,7 @@
 public class ICloudDeviceInformationParser {
     private final Gson gson = new GsonBuilder().create();
 
-    public ICloudAccountDataResponse parse(String json) throws JsonSyntaxException {
+    public @Nullable ICloudAccountDataResponse parse(String json) throws JsonSyntaxException {
         return gson.fromJson(json, ICloudAccountDataResponse.class);
     }
 }
diff --git a/...src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java b/...src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java
@@ -65,7 +65,7 @@ public class ICloudAccountBridgeHandler extends BaseBridgeHandler {
     @Nullable
     ServiceRegistration<?> service;
 
-    private Object synchronizeRefresh = new Object();
+    private final Object synchronizeRefresh = new Object();
 
     private List<ICloudDeviceInformationListener> deviceInformationListeners = Collections
             .synchronizedList(new ArrayList<ICloudDeviceInformationListener>());
@@ -167,6 +167,9 @@ public void refreshData() {
 
             try {
                 ICloudAccountDataResponse iCloudData = deviceInformationParser.parse(json);
+                if(iCloudData == null) {
+                    return;
+                }
                 int statusCode = Integer.parseUnsignedInt(iCloudData.getICloudAccountStatusCode());
                 if (statusCode == 200) {
                     updateStatus(ThingStatus.ONLINE);