Revert 2988357eb9

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -22,16 +22,10 @@ package org.wso2.carbon.device.mgt.core.task.impl;
 import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.task.DeviceMgtTaskException;
 import org.wso2.carbon.device.mgt.core.task.DeviceTaskManager;
 import org.wso2.carbon.ntask.core.Task;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.user.api.UserStoreException;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import java.util.List;
 
 import java.util.Map;
 
@@ -63,35 +57,18 @@ public class DeviceDetailsRetrieverTask implements Task {
         if (log.isDebugEnabled()) {
             log.debug("Device details retrieving task started to run.");
         }
-        try {
-            Tenant tenants[] = DeviceManagementDataHolder.getInstance().
-                    getRealmService().getTenantManager().getAllTenants();
-
-            for (Tenant tenant : tenants) {
 
-                try {
-                    PrivilegedCarbonContext.startTenantFlow();
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenant.getDomain());
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant.getId());
         DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
                 operationMonitoringTaskConfig);
         //pass the configurations also from here, monitoring tasks
         try {
             deviceTaskManager.addOperations();
         } catch (DeviceMgtTaskException e) {
-                        log.error("Error occurred while trying to add the operations to " +
+            log.error(
-                                "device to retrieve device details.", e);
+                    "Error occurred while trying to add the operations to device to retrieve device details.",
-                    }
+                    e);
-                } finally {
-                    PrivilegedCarbonContext.endTenantFlow();
-                }
-            }
-        } catch (UserStoreException e) {
-            log.error("Error occurred while trying to get the available tenants", e);
         }
 
-
     }
 
 }
-

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java

@@ -21,17 +21,16 @@ package org.wso2.carbon.policy.mgt.core.task;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.user.api.UserStoreException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,17 +59,6 @@ public class MonitoringTask implements Task {
             log.debug("Monitoring task started to run.");
         }
 
-        try {
-            Tenant tenants[] = PolicyManagementDataHolder.getInstance().
-                    getRealmService().getTenantManager().getAllTenants();
-
-            for (Tenant tenant : tenants) {
-
-                try {
-                    PrivilegedCarbonContext.startTenantFlow();
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenant.getDomain());
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant.getId());
-
         MonitoringManager monitoringManager = PolicyManagementDataHolder.getInstance().getMonitoringManager();
         List<String> deviceTypes = new ArrayList<>();
         List<String> configDeviceTypes = new ArrayList<>();
@@ -135,14 +123,6 @@ public class MonitoringTask implements Task {
         } else {
             log.info("No device types registered currently. So did not run the monitoring task.");
         }
-                } finally {
-                    PrivilegedCarbonContext.endTenantFlow();
-                }
-            }
-
-        } catch (UserStoreException e) {
-            log.error("Error occurred while trying to get the available tenants", e);
-        }
 
     }