Ensure heater type property is non-null

matchews · matchews · commit a383fed541bc · 2025-09-14T09:54:36.000-04:00
diff --git a/bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/discovery/HaywardDiscoveryService.java b/bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/discovery/HaywardDiscoveryService.java
@@ -125,8 +125,9 @@ public synchronized void mspConfigDiscovery(String xmlResponse) {
                     if (heaterId != null) {
                         heaterProps.put(HaywardBindingConstants.PROPERTY_SYSTEM_ID, heaterId);
                     }
-                    if (heater.getType() != null) {
-                        heaterProps.put(HaywardBindingConstants.PROPERTY_HEATER_TYPE, heater.getType());
+                    String type = heater.getType();
+                    if (type != null) {
+                        heaterProps.put(HaywardBindingConstants.PROPERTY_HEATER_TYPE, type);
                     }
                     onDeviceDiscovered(HaywardBindingConstants.THING_TYPE_HEATER,
                             heaterId != null ? heaterId : "Heater", heaterProps);

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,9 @@ public synchronized void mspConfigDiscovery(String xmlResponse) {`
`125`	`125`	`if (heaterId != null) {`
`126`	`126`	`heaterProps.put(HaywardBindingConstants.PROPERTY_SYSTEM_ID, heaterId);`
`127`	`127`	`}`
`128`		`- if (heater.getType() != null) {`
`129`		`- heaterProps.put(HaywardBindingConstants.PROPERTY_HEATER_TYPE, heater.getType());`
	`128`	`+ String type = heater.getType();`
	`129`	`+ if (type != null) {`
	`130`	`+ heaterProps.put(HaywardBindingConstants.PROPERTY_HEATER_TYPE, type);`
`130`	`131`	`}`
`131`	`132`	`onDeviceDiscovered(HaywardBindingConstants.THING_TYPE_HEATER,`
`132`	`133`	`heaterId != null ? heaterId : "Heater", heaterProps);`