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 'permanent-delete' into 'master'

Browse Source 
Fix Permanent delete for multiple enrollments

## Purpose
To enable permanent deletion of a sinlge device with multiple enroolmemts

## Goals
> (Goals achieved by feature)

## Approach

## Documentation

## Automation tests

## Security checks
 - Followed secure coding standards? (yes/no)
 - Ran FindSecurityBugs plugin and verified report? (yes/no)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes/no)

## Related MRs


## Test environment

## Learning

See merge request entgra/carbon-device-mgt!296
This commit is contained in:
Saad Sahibjan 2019-10-09 10:19:55 +00:00
commit ebf46f46e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,10 +533,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
try { try {
DeviceManagementDAOFactory.beginTransaction(); DeviceManagementDAOFactory.beginTransaction();
existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId); existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
if (existingDevices.size() != deviceIdentifiers.size()) { for (Device device : existingDevices) {
for (Device device : existingDevices) { deviceIdentifiers.remove(device.getDeviceIdentifier());
deviceIdentifiers.remove(device.getDeviceIdentifier()); }
} if (!deviceIdentifiers.isEmpty()) {
String msg = String msg =
"Couldn't find device ids for all the requested device identifiers. " + "Couldn't find device ids for all the requested device identifiers. " +
"Therefore payload should contain device identifiers which are not in the system. " + "Therefore payload should contain device identifiers which are not in the system. " +