Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #395

Browse Source
This commit is contained in:
Athou
2013-07-11 09:30:32 +02:00
parent 25a3d1bb02
commit bd6fd24e67
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -101,12 +101,13 @@ public class AdminREST extends AbstractResourceREST {
if (userModel.isAdmin()) {
roles.add(Role.ADMIN);
}
User user = userService.register(userModel.getName(),
userModel.getPassword(), userModel.getEmail(), roles, true);
if (user == null) {
return Response.status(Status.CONFLICT)
.entity("User already exists.").build();
try {
userService.register(userModel.getName(),
userModel.getPassword(), userModel.getEmail(), roles,
true);
} catch (Exception e) {
return Response.status(Status.CONFLICT).entity(e.getMessage())
.build();
}
} else {
User user = userDAO.findById(id);