Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java

@@ -229,7 +229,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
         //int tenantId = PolicyManagerUtil.getTenantId();
         Map<Integer, Device> deviceIds = new HashMap<>();
         List<ComplianceData> complianceDatas = new ArrayList<>();
-        HashMap<Integer, Integer> devicePolicyIdMap = null;
+        HashMap<Integer, Integer> devicePolicyIdMap = new HashMap<>();
 
         try {
             PolicyManagementDAOFactory.openConnection();
@@ -249,7 +249,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
 
             HashMap<Integer, Integer> temp = policyDAO.getAppliedPolicyIds();
             for (Integer id : deviceIDs) {
-                if (temp != null && temp.containsKey(id)) {
+                if (temp != null && !temp.isEmpty() && temp.containsKey(id)) {
                     devicePolicyIdMap.put(id, temp.get(id));
                 }
             }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java

@@ -23,7 +23,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
@@ -90,7 +89,7 @@ public class MonitoringTask implements Task {
                             PolicyManagementDataHolder.getInstance().getPolicyMonitoringService(deviceType.getName());
                     List<Device> devices = deviceManagementProviderService.getAllDevices(deviceType.getName());
                     if (monitoringService != null && !devices.isEmpty()) {
-                        monitoringManager.addMonitoringOperation(devices);
+
 
                         List<Device> notifiableDevices = new ArrayList<>();
 
@@ -118,6 +117,7 @@ public class MonitoringTask implements Task {
                                 log.debug(device.getDeviceIdentifier());
                             }
                         }
+                        monitoringManager.addMonitoringOperation(notifiableDevices);
                         monitoringService.notifyDevices(notifiableDevices);
                     }
                 }