Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

8 years ago · dd1aeb7f4a
parent f3a43ab270 00d21fc2ff
commit dd1aeb7f4a
1 changed files with 1 additions and 2 deletions
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
@ -65,8 +65,7 @@ public class DeviceTypeManagerService implements DeviceManagementService {
        this.operationMonitoringConfigs = new OperationMonitoringTaskConfig();
        this.setOperationMonitoringConfig(deviceTypeConfiguration);
        this.setInitialOperationConfig(deviceTypeConfiguration);
-        if (deviceTypeConfiguration.getPolicyMonitoring() != null && deviceTypeConfiguration.getPolicyMonitoring()
-                .isEnabled()) {
+        if (deviceTypeConfiguration.getPolicyMonitoring() != null ) {
            this.policyMonitoringManager = new DefaultPolicyMonitoringManager();
        }
    }