Added null check to resolve wso2/product-iots#1367

7 years ago · 5996e6841b
parent cd0195b7e7
commit 5996e6841b
1 changed files with 3 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java
@ -350,7 +350,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
        if (deviceStatusTaskPluginConfig != null && deviceStatusTaskPluginConfig.isRequireStatusMonitoring()) {
            try {
                DeviceManagementDataHolder.getInstance().removeDeviceStatusTaskPluginConfig(deviceType);
-                deviceStatusTaskManagerService.stopTask(deviceType, deviceStatusTaskPluginConfig);
+                if (deviceStatusTaskManagerService != null) {
+                    deviceStatusTaskManagerService.stopTask(deviceType, deviceStatusTaskPluginConfig);
+                }
            } catch (DeviceStatusTaskException e) {
                throw new DeviceManagementException("Error occurred while stopping Device Status task service for '" +
                        deviceManagementService.getType() + "'", e);