From bd6fd24e6720b08724490d79747f71bd0f4c0017 Mon Sep 17 00:00:00 2001 From: Athou Date: Thu, 11 Jul 2013 09:30:32 +0200 Subject: [PATCH] fix #395 --- .../frontend/rest/resources/AdminREST.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java index 9d8a9f54..3761cd74 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java @@ -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);