Fixing issue in get device API

7 years ago · aa4f7c13c5
parent 0e2f473a51
commit aa4f7c13c5
1 changed files with 1 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@ -709,7 +709,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
            } finally {
                DeviceManagementDAOFactory.closeConnection();
            }
-            if (requireDeviceInfo) {
+            if (requireDeviceInfo && !allDevices.isEmpty()) {
                paginationResult.setData(getAllDeviceInfo(allDevices));
            } else {
                paginationResult.setData(allDevices);