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

Fix device enrollment failure

Browse Source
This commit is contained in:
Pahansith Gunathilake 2022-03-01 10:46:36 +05:30
parent 294bf8ae90
commit 12c48540d8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,16 +994,19 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Group devices to the group: " + groupId); log.debug("Group devices to the group: " + groupId);
} }
Device device;
try { try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
GroupManagementDAOFactory.beginTransaction(); List<String> deviceIdentifierList = deviceIdentifiers.stream()
for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) { .map(DeviceIdentifier::getId)
device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider(). .collect(Collectors.toCollection(ArrayList::new));
getDevice(deviceIdentifier, false); List<Device> devicesList = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider()
if (device == null) { .getDeviceByIdList(deviceIdentifierList);
throw new DeviceNotFoundException("Device not found for id '" + deviceIdentifier.getId() + "'"); if (devicesList == null || devicesList.isEmpty()) {
throw new DeviceNotFoundException("Couldn't find any devices for the given deviceIdentifiers '" + deviceIdentifiers + "'");
} }
GroupManagementDAOFactory.beginTransaction();
for (Device device : devicesList) {
if (!this.groupDAO.isDeviceMappedToGroup(groupId, device.getId(), tenantId)) { if (!this.groupDAO.isDeviceMappedToGroup(groupId, device.getId(), tenantId)) {
this.groupDAO.addDevice(groupId, device.getId(), tenantId); this.groupDAO.addDevice(groupId, device.getId(), tenantId);
} }