Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/simple/PolicyEvaluationServiceImpl.java

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