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

fix NPE in discovery (#8931)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K 2020-11-01 21:29:47 +01:00 committed by GitHub
parent 603ceedff9
commit a6f6410b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/classes/Robot.java
View File

@ -148,4 +148,8 @@ public class Robot {
public void setCreatedAt(String createdAt) { public void setCreatedAt(String createdAt) {
this.createdAt = createdAt; this.createdAt = createdAt;
} }
public boolean discoveryInformationPresent() {
return serial != null && secretKey != null && name != null && model != null;
}
} }

5
bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/discovery/NeatoAccountDiscoveryService.java
View File

@ -84,9 +84,14 @@ public class NeatoAccountDiscoveryService extends AbstractDiscoveryService {
} }
private void addThing(Robot robot) { private void addThing(Robot robot) {
if (robot == null || !robot.discoveryInformationPresent()) {
return;
}
logger.debug("addThing(): Adding new Neato unit {} to the smarthome inbox", robot.getName()); logger.debug("addThing(): Adding new Neato unit {} to the smarthome inbox", robot.getName());
Map<String, Object> properties = new HashMap<>(); Map<String, Object> properties = new HashMap<>();
String serial = robot.getSerial();
ThingUID thingUID = new ThingUID(NeatoBindingConstants.THING_TYPE_VACUUMCLEANER, bridgeUID, robot.getSerial()); ThingUID thingUID = new ThingUID(NeatoBindingConstants.THING_TYPE_VACUUMCLEANER, bridgeUID, robot.getSerial());
properties.put(NeatoBindingConstants.CONFIG_SECRET, robot.getSecretKey()); properties.put(NeatoBindingConstants.CONFIG_SECRET, robot.getSecretKey());
properties.put(NeatoBindingConstants.CONFIG_SERIAL, robot.getSerial()); properties.put(NeatoBindingConstants.CONFIG_SERIAL, robot.getSerial());