fixed policy conflicts

revert-70aa11f8
Supun94 8 years ago
parent cc5d9012c1
commit c91da9219d

@ -91,12 +91,19 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
@Override @Override
public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyManagementException { public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
try { try {
Policy policy = PolicyManagementDataHolder.getInstance().getPolicyEvaluationPoint(). PolicyEvaluationPoint policyEvaluationPoint = PolicyManagementDataHolder.getInstance().getPolicyEvaluationPoint();
getEffectivePolicy(deviceIdentifier); Policy policy;
if (policyEvaluationPoint != null) {
policy = policyEvaluationPoint.
getEffectivePolicy(deviceIdentifier);
if (policy == null) { if (policy == null) {
return null; return null;
} }
} else {
throw new PolicyEvaluationException("Error occurred while getting the policy evaluation point " +
deviceIdentifier.getId() + " - " + deviceIdentifier.getType());
}
List<DeviceIdentifier> deviceIdentifiers = new ArrayList<DeviceIdentifier>(); List<DeviceIdentifier> deviceIdentifiers = new ArrayList<DeviceIdentifier>();
deviceIdentifiers.add(deviceIdentifier); deviceIdentifiers.add(deviceIdentifier);

@ -72,6 +72,11 @@ public class SimpleEvaluationPoint implements PolicyEvaluationPoint {
@Override @Override
public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException { public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException {
if (policyManagerService == null || policyList.size() == 0) {
return null;
}
Policy policy = new Policy(); Policy policy = new Policy();
Profile profile = new Profile(); Profile profile = new Profile();
profile.setProfileFeaturesList(getEffectiveFeatures(deviceIdentifier)); profile.setProfileFeaturesList(getEffectiveFeatures(deviceIdentifier));

Loading…
Cancel
Save