community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'corrective-policy' into 'corrective-policy'

Browse Source 
Improve mail sending logic

See merge request entgra/carbon-device-mgt!656
This commit is contained in:
Inosh Perara 2020-10-01 07:13:04 +00:00
commit fcd4bc1a41
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
View File

@ -4220,6 +4220,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
log.debug("Triggering Corrective action. Device Identifier: " + deviceIdentifier);
}
if (StringUtils.isBlank(featureCode)){
String msg = "Found a Blan feature code: " + featureCode;
log.error(msg);
throw new BadRequestException(msg);
}
if (configList == null || configList.isEmpty()) {
String msg = "Platform config is not configured";
log.error(msg);
@ -4236,7 +4241,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
for (String action : actions) {
for (ConfigurationEntry config : configList) {
if (config.getName().equals(featureCode)) {
if (featureCode.equals(config.getName())) {
CorrectiveActionConfig correctiveActionConfig = (CorrectiveActionConfig) config.getValue();
if (correctiveActionConfig.getActionTypes().contains(action)) {
if (DeviceManagementConstants.CorrectiveActions.E_MAIL.equals(action)) {