public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[infrastructure] add external null-annotations (#8848)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-10-31 00:29:03 +01:00
committed by GitHub
parent 47d05055db
commit bd664ff0c8
162 changed files with 933 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java
View File

@@ -255,7 +255,12 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
}
if (command instanceof RefreshType) {
updateChannelState(zone, channelType, zoneDataMap.get(zone.getZoneId()));
MonopriceAudioZoneDTO zoneDTO = zoneDataMap.get(zone.getZoneId());
if (zoneDTO != null) {
updateChannelState(zone, channelType, zoneDTO);
} else {
logger.info("Could not execute REFRESH command for zone {}: null", zone.getZoneId());
}
return;
}
@@ -462,12 +467,12 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
case MonopriceAudioConnector.KEY_ZONE_UPDATE:
String zoneId = updateData.substring(0, 2);
if (MonopriceAudioZone.VALID_ZONE_IDS.contains(zoneId)) {
MonopriceAudioZoneDTO zoneDTO = zoneDataMap.get(zoneId);
if (MonopriceAudioZone.VALID_ZONE_IDS.contains(zoneId) && zoneDTO != null) {
MonopriceAudioZone targetZone = MonopriceAudioZone.fromZoneId(zoneId);
processZoneUpdate(targetZone, zoneDataMap.get(zoneId), updateData);
processZoneUpdate(targetZone, zoneDTO, updateData);
} else {
logger.warn("invalid event: {} for key: {}", evt.getValue(), key);
logger.warn("invalid event: {} for key: {} or zone data null", evt.getValue(), key);
}
break;
default: