From 31dc6fc8394688cc1aa58e9e08843277c844b9e5 Mon Sep 17 00:00:00 2001
From: charithag <charitha@entgra.io>
Date: Fri, 19 Feb 2021 01:21:20 +0530
Subject: [PATCH] Fix NPE

---
 .../device/mgt/core/operation/mgt/OperationManagerImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
index 3ebbc1e04d4..32615eb5e25 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@@ -408,7 +408,7 @@ public class OperationManagerImpl implements OperationManager {
         if (DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
                 getPushNotificationConfiguration().getSchedulerBatchSize() <= enrolments.size() &&
                 notificationStrategy != null) {
-            isScheduled = notificationStrategy.getConfig().isScheduled();
+            isScheduled = notificationStrategy.getConfig() != null && notificationStrategy.getConfig().isScheduled();
         }
         int failAttempts = 0;
         while (true) {