mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' into 'master'
Prevent null pointer for device info See merge request entgra/carbon-device-mgt!450
This commit is contained in:
commit
2c2fc00f72
@ -124,7 +124,7 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
|
||||
Connection conn;
|
||||
PreparedStatement stmt = null;
|
||||
ResultSet rs = null;
|
||||
DeviceInfo deviceInfo = null;
|
||||
DeviceInfo deviceInfo = new DeviceInfo();
|
||||
try {
|
||||
conn = this.getConnection();
|
||||
|
||||
@ -135,7 +135,6 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
|
||||
rs = stmt.executeQuery();
|
||||
|
||||
if (rs.next()) {
|
||||
deviceInfo = new DeviceInfo();
|
||||
// deviceInfo.setIMEI(rs.getString("IMEI"));
|
||||
// deviceInfo.setIMSI(rs.getString("IMSI"));
|
||||
deviceInfo.setDeviceModel(rs.getString("DEVICE_MODEL"));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user