Merge pull request 'Fix EVENT_REVOKE operation is not being sent after geofence delete' (#397) from pramilaniroshan/device-mgt-core:rm-11182 into master

Reviewed-on: community/device-mgt-core#397
missing-default-permission
Pahansith Gunathilake 5 months ago
commit 01cf668905

@ -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) {

@ -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;
} }
} }

Loading…
Cancel
Save