community
/
device-mgt-core
12
0
Fork 45
Code Issues Pull Requests 24 Packages Projects Releases Wiki Activity

Merge branch 'fix-timestamp' into 'master'

Browse Source 
Fix invalid time showing in device list

See merge request entgra/carbon-device-mgt!861
merge-requests/842/merge
Pahansith Gunathilake 3 years ago
parent c9b5998ce9 778bb3e987
commit 7ef698058a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
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
Unescape View File

@ -74,7 +74,7 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
stmt.setDouble(14, deviceInfo.getTotalRAMMemory()); stmt.setDouble(14, deviceInfo.getTotalRAMMemory());
stmt.setDouble(15, deviceInfo.getAvailableRAMMemory()); stmt.setDouble(15, deviceInfo.getAvailableRAMMemory());
stmt.setBoolean(16, deviceInfo.isPluggedIn()); stmt.setBoolean(16, deviceInfo.isPluggedIn());
stmt.setLong(17, DeviceManagementDAOUtil.getCurrentUTCTime()); stmt.setLong(17, DeviceManagementDAOUtil.getCurrentUTCTime() * 1000L);
stmt.setInt(18, enrolmentId); stmt.setInt(18, enrolmentId);
stmt.execute(); stmt.execute();
@ -508,7 +508,7 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
stmt.setDouble(13, newDeviceInfo.getTotalRAMMemory()); stmt.setDouble(13, newDeviceInfo.getTotalRAMMemory());
stmt.setDouble(14, newDeviceInfo.getAvailableRAMMemory()); stmt.setDouble(14, newDeviceInfo.getAvailableRAMMemory());
stmt.setBoolean(15, newDeviceInfo.isPluggedIn()); stmt.setBoolean(15, newDeviceInfo.isPluggedIn());
stmt.setLong(16, System.currentTimeMillis()); stmt.setLong(16, DeviceManagementDAOUtil.getCurrentUTCTime() * 1000L);
stmt.setInt(17, deviceId); stmt.setInt(17, deviceId);
stmt.setInt(18, enrollmentId); stmt.setInt(18, enrollmentId);

Write Preview
Loading…
Cancel
Save