From 35e05677057b96bb35fd4caaff97fc73c01a3b20 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 30 Mar 2015 08:32:57 +0200
Subject: [PATCH] fix exception when saving role for a non-existing user

---
 src/main/java/com/commafeed/backend/service/UserService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/service/UserService.java b/src/main/java/com/commafeed/backend/service/UserService.java
index 25112bd8..980a81a5 100644
--- a/src/main/java/com/commafeed/backend/service/UserService.java
+++ b/src/main/java/com/commafeed/backend/service/UserService.java
@@ -116,10 +116,10 @@ public class UserService {
 		user.setCreated(new Date());
 		user.setSalt(salt);
 		user.setPassword(encryptionService.getEncryptedPassword(password, salt));
+		userDAO.saveOrUpdate(user);
 		for (Role role : roles) {
 			userRoleDAO.saveOrUpdate(new UserRole(user, role));
 		}
-		userDAO.saveOrUpdate(user);
 		return user;
 	}