demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NullPointerException (#18034)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2025-01-04 19:59:11 +01:00 committed by GitHub
parent 7cc9903158
commit 8a3baf8003
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
View File

@ -18,6 +18,7 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -87,7 +88,7 @@ public class EnOceanBaseSensorHandler extends EnOceanBaseThingHandler implements
config.receivingEEPId.forEach(receivingEEP -> { config.receivingEEPId.forEach(receivingEEP -> {
EEPType receivingEEPType = EEPType.getType(receivingEEP); EEPType receivingEEPType = EEPType.getType(receivingEEP);
EEPType existingKey = receivingEEPTypes.putIfAbsent(receivingEEPType.getRORG(), receivingEEPType); EEPType existingKey = receivingEEPTypes.putIfAbsent(receivingEEPType.getRORG(), receivingEEPType);
if (existingKey != null) { if (!Objects.isNull(existingKey)) {
throw new IllegalArgumentException("Receiving more than one EEP of the same RORG is not supported"); throw new IllegalArgumentException("Receiving more than one EEP of the same RORG is not supported");
} }
}); });
@ -155,6 +156,9 @@ public class EnOceanBaseSensorHandler extends EnOceanBaseThingHandler implements
ERP1Message msg = (ERP1Message) packet; ERP1Message msg = (ERP1Message) packet;
EEPType localReceivingType = receivingEEPTypes.get(msg.getRORG()); EEPType localReceivingType = receivingEEPTypes.get(msg.getRORG());
if (Objects.isNull(localReceivingType)) {
return;
}
EEP eep = EEPFactory.buildEEP(localReceivingType, (ERP1Message) packet); EEP eep = EEPFactory.buildEEP(localReceivingType, (ERP1Message) packet);
logger.debug("ESP Packet payload {} for {} received", HexUtils.bytesToHex(packet.getPayload()), logger.debug("ESP Packet payload {} for {} received", HexUtils.bytesToHex(packet.getPayload()),