Prevent null pointer for device info

5 years ago · 7b010f045d
parent 2d87cfa96b
commit 7b010f045d
1 changed files with 1 additions and 2 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/dao/impl/DeviceDetailsDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/dao/impl/DeviceDetailsDAOImpl.java
@ -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"));