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

Added some robustness

Browse source
This commit is contained in:
Ziver Koc 2016-08-29 18:42:34 +02:00
parent d3cd7287d5
commit beac1c34c4
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/se/hal/struct/Event.java
View file

@ -52,11 +52,13 @@ public class Event extends AbstractDevice<HalEventConfig,HalEventData>{
if (deviceDataClass == null)
throw new ClassNotFoundException("Unknown event data class for: " + getDeviceConfig().getClass());
PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
stmt.setLong(1, getId());
return (HalEventData)
DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
if (getId() != null) {
PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
stmt.setLong(1, getId());
return (HalEventData)
DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
}
} catch (Exception e){
logger.log(Level.WARNING, null, e);
}

12
src/se/hal/struct/Sensor.java
View file

@ -121,11 +121,13 @@ public class Sensor extends AbstractDevice<HalSensorConfig,HalSensorData>{
if (deviceDataClass == null)
throw new ClassNotFoundException("Unknown sensor data class for: " + getDeviceConfig().getClass());
PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
stmt.setLong(1, getId());
return (HalSensorData)
DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
if (getId() != null) {
PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
stmt.setLong(1, getId());
return (HalSensorData)
DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
}
} catch (Exception e){
logger.log(Level.WARNING, null, e);
}