Fix discovery of TRVs when rooms with no TRVs exist

Signed-off-by: Andrew Schofield <[email protected]> (github: andrew-schofield)
openhab · Mar 14, 2018 · c9bf0b2 · c9bf0b2
1 parent 47513c7
commit c9bf0b2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...g.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/handler/HeatHubHandler.java b/...g.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/handler/HeatHubHandler.java
@@ -305,13 +305,17 @@ public Room getRoomForDeviceId(Integer id) {
                 if (room.getRoomStatId() != null && room.getRoomStatId().equals(id)) {
                     return room;
                 }
-                for (Integer itrv : room.getSmartValveIds()) {
+
+                List<Integer> trvs = room.getSmartValveIds();
+                if (trvs != null) {
+                    for (Integer itrv : trvs) {
                     if (itrv.equals(id)) {
                         return room;
                     }
                 }
             }
         }
+        }
 
         return null;
     }