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

Fix monitoring re-applying issue when policy revoking

Browse Source
This commit is contained in:
tcdlpds@gmail.com 2020-11-13 01:30:21 +05:30
parent fc74a1e316
commit 6b228ee73e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,14 +267,20 @@ public class MonitoringManagerImpl implements MonitoringManager {
int enrollmentId;
for (Device device : devices) {
enrollmentId = device.getEnrolmentInfo().getId();
if (persistedComplianceData.containsKey(enrollmentId)) {
notifiableDeviceEnrollments.put(enrollmentId, device);
} else if (appliedPolicyIds.containsKey(enrollmentId)){
PolicyDeviceWrapper policyDeviceWrapper = new PolicyDeviceWrapper();
policyDeviceWrapper.setDeviceId(device.getId());
policyDeviceWrapper.setEnrolmentId(device.getEnrolmentInfo().getId());
policyDeviceWrapper.setPolicyId(appliedPolicyIds.get(enrollmentId));
firstTimeComplianceData.add(policyDeviceWrapper);
/*
When a policy has applied to the device, and the first monitoring operation runs on the policy, then it
is considered as a compliance policy and adds monitoring operation on the applied policy.
If the device has identified the applied policy as either compliance or non-compliance policy then
adds monitoring operation on the applied policy.
.*/
if (appliedPolicyIds.containsKey(enrollmentId)) {
if (!persistedComplianceData.containsKey(enrollmentId)) {
PolicyDeviceWrapper policyDeviceWrapper = new PolicyDeviceWrapper();
policyDeviceWrapper.setDeviceId(device.getId());
policyDeviceWrapper.setEnrolmentId(device.getEnrolmentInfo().getId());
policyDeviceWrapper.setPolicyId(appliedPolicyIds.get(enrollmentId));
firstTimeComplianceData.add(policyDeviceWrapper);
}
notifiableDeviceEnrollments.put(enrollmentId, device);
}
}