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

This commit is contained in:
Sheldan
2023-02-26 14:16:27 +01:00
parent 21add6585d
commit a984bdb84e

View File

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