This commit is contained in:
Athou
2015-03-19 13:01:03 +01:00
parent 6fd11fcd56
commit c7ab179a9e
4 changed files with 3 additions and 19 deletions

View File

@@ -215,7 +215,7 @@ public class UserREST {
if (request.isNewApiKey()) {
user.setApiKey(userService.generateApiKey(user));
}
userDAO.merge(user);
userDAO.saveOrUpdate(user);
return Response.ok().build();
}