Merge branch 'master' into 'master'

Add missing commit in master - Fix NPE for policy

See merge request entgra/carbon-device-mgt!177
revert-70aa11f8
Dharmakeerthi Lasantha 5 years ago
commit e42950dd76

@ -43,9 +43,11 @@ public class PolicyEvaluationServiceImpl implements PolicyEvaluationPoint {
@Override
public List<ProfileFeature> getEffectiveFeatures(DeviceIdentifier deviceIdentifier)
throws PolicyEvaluationException {
List<ProfileFeature> effectiveFeatures = evaluation.getEffectivePolicy(deviceIdentifier).
getProfile().getProfileFeaturesList();
List<ProfileFeature> effectiveFeatures = null;
Policy effectivePolicy = evaluation.getEffectivePolicy(deviceIdentifier);
if (effectivePolicy != null) {
effectiveFeatures = effectivePolicy.getProfile().getProfileFeaturesList();
}
return effectiveFeatures;
}

Loading…
Cancel
Save