garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix exception when saving role for a non-existing user

Browse Source
This commit is contained in:
Athou
2015-03-30 08:32:57 +02:00
parent fb2add305e
commit 35e0567705
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/backend/service/UserService.java
View File

@@ -116,10 +116,10 @@ public class UserService {
user.setCreated(new Date()); user.setCreated(new Date());
user.setSalt(salt); user.setSalt(salt);
user.setPassword(encryptionService.getEncryptedPassword(password, salt)); user.setPassword(encryptionService.getEncryptedPassword(password, salt));
userDAO.saveOrUpdate(user);
for (Role role : roles) { for (Role role : roles) {
userRoleDAO.saveOrUpdate(new UserRole(user, role)); userRoleDAO.saveOrUpdate(new UserRole(user, role));
} }
userDAO.saveOrUpdate(user);
return user; return user;
} }