Fixing NPE thrown while shutting down the MDM server

10 years ago · 6ca7ee6c78
parent 2c5cc4c28d
commit 6ca7ee6c78
1 changed files with 9 additions and 4 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
@ -102,10 +102,15 @@ public class MobileDeviceManagementServiceComponent {
            log.debug("De-activating Mobile Device Management Service Component");
        }
        try {
+            if (androidServiceRegRef != null) {
                androidServiceRegRef.unregister();
+            }
+            if (iOSServiceRegRef != null) {
                iOSServiceRegRef.unregister();
+            }
+            if (windowsServiceRegRef != null) {
                windowsServiceRegRef.unregister();
-            serverStartupObserverRef.unregister();
+            }

 			if (log.isDebugEnabled()) {
 				log.debug(