Synchronize critical ConfigUserService methods

diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index a9217b5c596af0694d4cf1899ee9b057917a5414..44687b49c936853dac4659782571a83dc15e01c7 100644 (file)
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -200,7 +200,7 @@ public class ConfigUserService implements IUserService {
         * @return a user object or null\r
         */\r
        @Override\r
-       public UserModel authenticate(char[] cookie) {\r
+       public synchronized UserModel authenticate(char[] cookie) {\r
                String hash = new String(cookie);\r
                if (StringUtils.isEmpty(hash)) {\r
                        return null;\r
@@ -269,7 +269,7 @@ public class ConfigUserService implements IUserService {
         * @return a user object or null\r
         */\r
        @Override\r
-       public UserModel getUserModel(String username) {\r
+       public synchronized UserModel getUserModel(String username) {\r
                read();\r
                UserModel model = users.get(username.toLowerCase());\r
                if (model != null) {\r
@@ -299,7 +299,7 @@ public class ConfigUserService implements IUserService {
         * @since 1.2.0\r
         */\r
        @Override\r
-       public boolean updateUserModels(Collection<UserModel> models) {\r
+       public synchronized boolean updateUserModels(Collection<UserModel> models) {\r
                try {\r
                        read();\r
                        for (UserModel model : models) {\r
@@ -351,7 +351,7 @@ public class ConfigUserService implements IUserService {
         * @return true if update is successful\r
         */\r
        @Override\r
-       public boolean updateUserModel(String username, UserModel model) {\r
+       public synchronized boolean updateUserModel(String username, UserModel model) {\r
                UserModel originalUser = null;\r
                try {\r
                        read();\r
@@ -417,7 +417,7 @@ public class ConfigUserService implements IUserService {
         * @return true if successful\r
         */\r
        @Override\r
-       public boolean deleteUser(String username) {\r
+       public synchronized boolean deleteUser(String username) {\r
                try {\r
                        // Read realm file\r
                        read();\r
@@ -467,7 +467,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public List<TeamModel> getAllTeams() {\r
+       public synchronized List<TeamModel> getAllTeams() {\r
                read();\r
                List<TeamModel> list = new ArrayList<TeamModel>(teams.values());\r
                list = DeepCopier.copy(list);\r
@@ -484,7 +484,7 @@ public class ConfigUserService implements IUserService {
         * @return list of all usernames that can bypass the access restriction\r
         */\r
        @Override\r
-       public List<String> getTeamnamesForRepositoryRole(String role) {\r
+       public synchronized List<String> getTeamnamesForRepositoryRole(String role) {\r
                List<String> list = new ArrayList<String>();\r
                try {\r
                        read();\r
@@ -511,7 +511,7 @@ public class ConfigUserService implements IUserService {
         * @return true if successful\r
         */\r
        @Override\r
-       public boolean setTeamnamesForRepositoryRole(String role, List<String> teamnames) {\r
+       public synchronized boolean setTeamnamesForRepositoryRole(String role, List<String> teamnames) {\r
                try {\r
                        Set<String> specifiedTeams = new HashSet<String>();\r
                        for (String teamname : teamnames) {\r
@@ -548,7 +548,7 @@ public class ConfigUserService implements IUserService {
         * @since 0.8.0\r
         */\r
        @Override\r
-       public TeamModel getTeamModel(String teamname) {\r
+       public synchronized TeamModel getTeamModel(String teamname) {\r
                read();\r
                TeamModel model = teams.get(teamname.toLowerCase());\r
                if (model != null) {\r
@@ -678,7 +678,7 @@ public class ConfigUserService implements IUserService {
         * @return list of all usernames\r
         */\r
        @Override\r
-       public List<UserModel> getAllUsers() {\r
+       public synchronized List<UserModel> getAllUsers() {\r
                read();\r
                List<UserModel> list = new ArrayList<UserModel>(users.values());\r
                list = DeepCopier.copy(list);\r
@@ -695,7 +695,7 @@ public class ConfigUserService implements IUserService {
         * @return list of all usernames that can bypass the access restriction\r
         */\r
        @Override\r
-       public List<String> getUsernamesForRepositoryRole(String role) {\r
+       public synchronized List<String> getUsernamesForRepositoryRole(String role) {\r
                List<String> list = new ArrayList<String>();\r
                try {\r
                        read();\r
@@ -723,7 +723,7 @@ public class ConfigUserService implements IUserService {
         */\r
        @Override\r
        @Deprecated\r
-       public boolean setUsernamesForRepositoryRole(String role, List<String> usernames) {\r
+       public synchronized boolean setUsernamesForRepositoryRole(String role, List<String> usernames) {\r
                try {\r
                        Set<String> specifiedUsers = new HashSet<String>();\r
                        for (String username : usernames) {\r
@@ -760,7 +760,7 @@ public class ConfigUserService implements IUserService {
         * @return true if successful\r
         */\r
        @Override\r
-       public boolean renameRepositoryRole(String oldRole, String newRole) {\r
+       public synchronized boolean renameRepositoryRole(String oldRole, String newRole) {\r
                try {\r
                        read();\r
                        // identify users which require role rename\r
@@ -795,7 +795,7 @@ public class ConfigUserService implements IUserService {
         * @return true if successful\r
         */\r
        @Override\r
-       public boolean deleteRepositoryRole(String role) {\r
+       public synchronized boolean deleteRepositoryRole(String role) {\r
                try {\r
                        read();\r
 \r