Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-27 06:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-86] fixing exception in case of a re-joining user without experience role

Browse Source
This commit is contained in:
Sheldan
2023-02-26 14:16:27 +01:00
parent 21add6585d
commit a984bdb84e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java
View File

@@ -275,13 +275,13 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
CompletableFuture<Void> returningFuture; CompletableFuture<Void> returningFuture;
if(!Objects.equals(oldRoleId, newRoleId) || forceRoles) { if(!Objects.equals(oldRoleId, newRoleId) || forceRoles) {
CompletableFuture<Void> addingFuture; CompletableFuture<Void> addingFuture;
if(oldRoleId != null || forceRoles) { if(oldRoleId != null) {
addingFuture = roleService.removeRoleFromMemberAsync(member, oldRoleId); addingFuture = roleService.removeRoleFromMemberAsync(member, oldRoleId);
} else { } else {
addingFuture = CompletableFuture.completedFuture(null); addingFuture = CompletableFuture.completedFuture(null);
} }
CompletableFuture<Void> removingFeature; CompletableFuture<Void> removingFeature;
if(newRoleId != null || forceRoles) { if(newRoleId != null) {
removingFeature = roleService.addRoleToMemberAsync(member, newRoleId); removingFeature = roleService.addRoleToMemberAsync(member, newRoleId);
} else { } else {
removingFeature = CompletableFuture.completedFuture(null); removingFeature = CompletableFuture.completedFuture(null);