From 3eec1a38466cc6ef2692918f235226f042f3c223 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Sat, 22 Aug 2015 04:55:22 +0530
Subject: [PATCH] Refactored policy compliance

---
 .../mobile/impl/android/AndroidPolicyMonitoringService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
index d6e0fceeb..acc7337c2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
@@ -52,10 +52,10 @@ public class AndroidPolicyMonitoringService implements PolicyMonitoringService {
         if (log.isDebugEnabled()) {
             log.debug("Checking policy compliance status of device '" + deviceIdentifier.getId() + "'");
         }
-        if (compliancePayload == null || policy == null) {
-            return null;
-        }
         ComplianceData complianceData = new ComplianceData();
+        if (compliancePayload == null || policy == null) {
+            return complianceData;
+        }
         List<ComplianceFeature> complianceFeatures = new ArrayList<ComplianceFeature>();
 
         // Parsing json string to get compliance features.