Merge branch 'master' into 'master'

Prevent null pointer for device info

See merge request entgra/carbon-device-mgt!450
feature/appm-store/pbac
Saad Sahibjan 5 years ago
commit 2c2fc00f72

@ -124,7 +124,7 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
Connection conn; Connection conn;
PreparedStatement stmt = null; PreparedStatement stmt = null;
ResultSet rs = null; ResultSet rs = null;
DeviceInfo deviceInfo = null; DeviceInfo deviceInfo = new DeviceInfo();
try { try {
conn = this.getConnection(); conn = this.getConnection();
@ -135,7 +135,6 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
rs = stmt.executeQuery(); rs = stmt.executeQuery();
if (rs.next()) { if (rs.next()) {
deviceInfo = new DeviceInfo();
// deviceInfo.setIMEI(rs.getString("IMEI")); // deviceInfo.setIMEI(rs.getString("IMEI"));
// deviceInfo.setIMSI(rs.getString("IMSI")); // deviceInfo.setIMSI(rs.getString("IMSI"));
deviceInfo.setDeviceModel(rs.getString("DEVICE_MODEL")); deviceInfo.setDeviceModel(rs.getString("DEVICE_MODEL"));

Loading…
Cancel
Save