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/cache/impl/PolicyCacheManagerImpl.java

@@ -85,8 +85,18 @@ public class PolicyCacheManagerImpl implements PolicyCacheManager {
             for (Policy policy : cachedPolicy) {
                 log.debug("Policy id in cache .. : " + policy.getId() + " policy name : " + policy.
                         getPolicyName() + " Activated : " + policy.isActive());
+
+                List<String> users = policy.getUsers();
+                for (String user : users) {
+                    log.debug("Users in cached policy : " + user);
+                }
+                List<String> roles = policy.getRoles();
+                for (String role : roles) {
+                    log.debug("Roles in cached policy : " + role);
                 }
             }
+
+        }
         return lCache.get(1);
 
     }

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

@@ -68,7 +68,7 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
 //        } catch (PolicyDelegationException e) {
 //            throw new PolicyManagementException("Error occurred while delegating policy operation to the devices", e);
 //        }
-        PolicyCacheManagerImpl.getInstance().addPolicy(resultantPolicy);
+        PolicyCacheManagerImpl.getInstance().rePopulateCache();
         return resultantPolicy;
     }
 
@@ -80,7 +80,7 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
 //        } catch (PolicyDelegationException e) {
 //            throw new PolicyManagementException("Error occurred while delegating policy operation to the devices", e);
 //        }
-        PolicyCacheManagerImpl.getInstance().updatePolicy(resultantPolicy);
+        PolicyCacheManagerImpl.getInstance().rePopulateCache();
         return resultantPolicy;
     }