ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed nullpointer crash

Browse source
This commit is contained in:
Ziver Koc 2016-08-26 17:07:09 +02:00
parent 439be77a8b
commit 3574f7a433
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/se/hal/page/MapHttpPage.java
View file

@ -112,7 +112,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage
DataNode sensorsNode = new DataNode(DataNode.DataType.List); DataNode sensorsNode = new DataNode(DataNode.DataType.List);
for (Sensor sensor : Sensor.getLocalSensors(db)) { for (Sensor sensor : Sensor.getLocalSensors(db)) {
DataNode sensorNode = getDeviceNode(sensor); DataNode sensorNode = getDeviceNode(sensor);
sensorNode.set("data", sensor.getDeviceData().getData()); sensorNode.set("data", ""+sensor.getDeviceData());
sensorsNode.add(sensorNode); sensorsNode.add(sensorNode);
} }
root.set("sensors", sensorsNode); root.set("sensors", sensorsNode);
@ -120,7 +120,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage
DataNode eventsNode = new DataNode(DataNode.DataType.List); DataNode eventsNode = new DataNode(DataNode.DataType.List);
for (Event event : Event.getLocalEvents(db)) { for (Event event : Event.getLocalEvents(db)) {
DataNode eventNode = getDeviceNode(event); DataNode eventNode = getDeviceNode(event);
eventNode.set("data", event.getDeviceData().getData()); eventNode.set("data", ""+event.getDeviceData());
eventsNode.add(eventNode); eventsNode.add(eventNode);
} }
root.set("events", eventsNode); root.set("events", eventsNode);