community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix only reading one result when multiple results are present

See merge request entgra/carbon-device-mgt!436
This commit is contained in:
Dharmakeerthi Lasantha 2020-02-05 07:44:59 +00:00
commit c8c817750e
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
View File

@ -1837,7 +1837,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
List<Device> devices = new ArrayList<>(); List<Device> devices = new ArrayList<>();
DeviceInfo deviceInfo = new DeviceInfo(); DeviceInfo deviceInfo = new DeviceInfo();
if (rs.next()) { while (rs.next()) {
Device device = DeviceManagementDAOUtil.loadDevice(rs); Device device = DeviceManagementDAOUtil.loadDevice(rs);
deviceInfo.setOsVersion(rs.getString(Constants.OS_VERSION)); deviceInfo.setOsVersion(rs.getString(Constants.OS_VERSION));
deviceInfo.setOsBuildDate(rs.getString(Constants.OS_BUILD_DATE)); deviceInfo.setOsBuildDate(rs.getString(Constants.OS_BUILD_DATE));

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java
View File

@ -876,7 +876,7 @@ public class OracleDeviceDAOImpl extends AbstractDeviceDAOImpl {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
List<Device> devices = new ArrayList<>(); List<Device> devices = new ArrayList<>();
DeviceInfo deviceInfo = new DeviceInfo(); DeviceInfo deviceInfo = new DeviceInfo();
if (rs.next()) { while (rs.next()) {
Device device = DeviceManagementDAOUtil.loadDevice(rs); Device device = DeviceManagementDAOUtil.loadDevice(rs);
deviceInfo.setOsVersion(rs.getString(Constants.OS_VERSION)); deviceInfo.setOsVersion(rs.getString(Constants.OS_VERSION));
deviceInfo.setOsBuildDate(rs.getString(Constants.OS_BUILD_DATE)); deviceInfo.setOsBuildDate(rs.getString(Constants.OS_BUILD_DATE));

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/report/mgt/ReportManagementServiceImpl.java
View File

@ -160,7 +160,6 @@ public class ReportManagementServiceImpl implements ReportManagementService {
public PaginationResult getDevicesExpiredByOSVersion(PaginationRequest request) public PaginationResult getDevicesExpiredByOSVersion(PaginationRequest request)
throws ReportManagementException, DeviceTypeNotFoundException { throws ReportManagementException, DeviceTypeNotFoundException {
if (request == null || if (request == null ||
StringUtils.isBlank(request.getDeviceType()) ||
StringUtils.isBlank(request.getDeviceType()) || StringUtils.isBlank(request.getDeviceType()) ||
!request.getProperties().containsKey(Constants.OS_BUILD_DATE) || !request.getProperties().containsKey(Constants.OS_BUILD_DATE) ||
(Long) request.getProperty(Constants.OS_BUILD_DATE) == 0) { (Long) request.getProperty(Constants.OS_BUILD_DATE) == 0) {