From 0a321e279a1172dfe9bfa73d341335434cc8c096 Mon Sep 17 00:00:00 2001 From: mharindu Date: Thu, 24 Sep 2015 14:37:52 +0530 Subject: [PATCH] Added null check to getLicense --- .../service/DeviceManagementProviderServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index 919a901fa5..494b03da1d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -603,6 +603,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv @Override public License getLicense(String deviceType, String languageCode) throws DeviceManagementException { DeviceManager deviceManager = this.getDeviceManager(deviceType); + License license; if (deviceManager == null) { if (log.isDebugEnabled()) { log.debug("Device Manager associated with the device type '" + deviceType + "' is null. " + @@ -611,7 +612,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv return null; } try { - return deviceManager.getLicense(languageCode); + license = deviceManager.getLicense(languageCode); + if (license == null) { + if (log.isDebugEnabled()) { + log.debug("Cannot find a license for '" + deviceType + "' device type"); + } + } + return license; } catch (LicenseManagementException e) { throw new DeviceManagementException("Error occurred while retrieving license configured for " + "device type '" + deviceType + "' and language code '" + languageCode + "'", e); @@ -851,7 +858,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } } - public List getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException { List devices = new ArrayList<>(); List allDevices;