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 pull request 'Fix EVENT_REVOKE operation is not being sent after geofence delete' (#397) from pramilaniroshan/device-mgt-core:rm-11182 into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/397
This commit is contained in:
Pahansith Gunathilake 2024-05-20 06:55:44 +00:00
commit 01cf668905
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/GenericGeofenceDAOImpl.java
View File

@ -626,6 +626,9 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
geofenceData.setGroupData(groupMap); geofenceData.setGroupData(groupMap);
} }
} }
if (geofenceData != null) {
geofenceData.setGroupIds(new ArrayList<>(groupMap.keySet()));
}
return geofenceData; return geofenceData;
} }
} catch (SQLException e) { } catch (SQLException e) {

3
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/SQLServerGeofenceDAOImpl.java
View File

@ -157,6 +157,9 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
geofenceData.setFenceShape(rst.getString("FENCE_SHAPE")); geofenceData.setFenceShape(rst.getString("FENCE_SHAPE"));
geofenceData.setGroupData(groupMap); geofenceData.setGroupData(groupMap);
} }
if (geofenceData != null) {
geofenceData.setGroupIds(new ArrayList<>(groupMap.keySet()));
}
return geofenceData; return geofenceData;
} }
} }