issue-323: Synchronize all user service methods

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index e8652252e2d5ee17ec12966ea0fc548dd8c1534d..a2a3277e9bf38d8f7d16992ae049a2ce54c65158 100644 (file)
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -133,7 +133,7 @@ public class ConfigUserService implements IUserService {
         * @return cookie value\r
         */\r
        @Override\r
-       public String getCookie(UserModel model) {\r
+       public synchronized String getCookie(UserModel model) {\r
                if (!StringUtils.isEmpty(model.cookie)) {\r
                        return model.cookie;\r
                }\r
@@ -195,7 +195,7 @@ public class ConfigUserService implements IUserService {
         * @return true if update is successful\r
         */\r
        @Override\r
-       public boolean updateUserModel(UserModel model) {\r
+       public synchronized boolean updateUserModel(UserModel model) {\r
                return updateUserModel(model.username, model);\r
        }\r
 \r
@@ -325,7 +325,7 @@ public class ConfigUserService implements IUserService {
         * @return true if successful\r
         */\r
        @Override\r
-       public boolean deleteUserModel(UserModel model) {\r
+       public synchronized boolean deleteUserModel(UserModel model) {\r
                return deleteUser(model.username);\r
        }\r
 \r
@@ -372,7 +372,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public List<String> getAllTeamNames() {\r
+       public synchronized List<String> getAllTeamNames() {\r
                read();\r
                List<String> list = new ArrayList<String>(teams.keySet());\r
                Collections.sort(list);\r
@@ -447,7 +447,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public boolean updateTeamModel(TeamModel model) {\r
+       public synchronized boolean updateTeamModel(TeamModel model) {\r
                return updateTeamModel(model.name, model);\r
        }\r
 \r
@@ -459,7 +459,7 @@ public class ConfigUserService implements IUserService {
         * @since 1.2.0\r
         */\r
        @Override\r
-       public boolean updateTeamModels(Collection<TeamModel> models) {\r
+       public synchronized boolean updateTeamModels(Collection<TeamModel> models) {\r
                try {\r
                        read();\r
                        for (TeamModel team : models) {\r
@@ -485,7 +485,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public boolean updateTeamModel(String teamname, TeamModel model) {\r
+       public synchronized boolean updateTeamModel(String teamname, TeamModel model) {\r
                TeamModel original = null;\r
                try {\r
                        read();\r
@@ -514,7 +514,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public boolean deleteTeamModel(TeamModel model) {\r
+       public synchronized boolean deleteTeamModel(TeamModel model) {\r
                return deleteTeam(model.name);\r
        }\r
 \r
@@ -526,7 +526,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public boolean deleteTeam(String teamname) {\r
+       public synchronized boolean deleteTeam(String teamname) {\r
                try {\r
                        // Read realm file\r
                        read();\r
@@ -545,7 +545,7 @@ public class ConfigUserService implements IUserService {
         * @return list of all usernames\r
         */\r
        @Override\r
-       public List<String> getAllUsernames() {\r
+       public synchronized List<String> getAllUsernames() {\r
                read();\r
                List<String> list = new ArrayList<String>(users.keySet());\r
                Collections.sort(list);\r