Merge master

This commit is contained in:
Tu Tran
2020-12-10 11:40:51 +07:00
55 changed files with 4807 additions and 4521 deletions
@@ -490,7 +490,8 @@ public class UserStoreImpl implements UserStore {
roleDefinitions.put(roleDefinition.getId(), roleDefinition);
}
LockUtil.executeWithWriteLock(preferenceLock, () -> {
for (User user : newUserStore.getUsers()) {
for (final User user : newUserStore.getUsers()) {
user.setUserGroupProvider(this);
users.put(user.getName(), user);
addToUsersByEmail(user);
for (Entry<String, String> userPref : newUserStore.getAllPreferences(user.getName()).entrySet()) {