Improve remoting

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jackrabbit / src / main / java / org / argeo / jackrabbit / JackrabbitAuthorizations.java

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
index d33f886a89ffd7bb3636c20b0817727e032d138d..59cbe2af86786897ff6077ecdbf838fa1e6b8a45 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
@@ -16,7 +16,7 @@
 package org.argeo.jackrabbit;
 
 import java.security.Principal;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.jcr.RepositoryException;
@@ -35,26 +35,29 @@ public class JackrabbitAuthorizations extends JcrAuthorizations {
        private final static Log log = LogFactory
                        .getLog(JackrabbitAuthorizations.class);
 
-       private List<String> groupPrefixes = new ArrayList<String>();
+       private List<String> groupPrefixes = Arrays
+                       .asList(new String[] { "ROLE_" });// new ArrayList<String>();
 
        @Override
        protected Principal getOrCreatePrincipal(Session session,
                        String principalName) throws RepositoryException {
                UserManager um = ((JackrabbitSession) session).getUserManager();
-               Authorizable authorizable = um.getAuthorizable(principalName);
-               if (authorizable == null) {
-                       groupPrefixes: for (String groupPrefix : groupPrefixes) {
-                               if (principalName.startsWith(groupPrefix)) {
-                                       authorizable = um.createGroup(principalName);
-                                       log.info("Created group " + principalName);
-                                       break groupPrefixes;
+               synchronized (um) {
+                       Authorizable authorizable = um.getAuthorizable(principalName);
+                       if (authorizable == null) {
+                               groupPrefixes: for (String groupPrefix : groupPrefixes) {
+                                       if (principalName.startsWith(groupPrefix)) {
+                                               authorizable = um.createGroup(principalName);
+                                               log.info("Created group " + principalName);
+                                               break groupPrefixes;
+                                       }
                                }
+                               if (authorizable == null)
+                                       throw new ArgeoException("Authorizable " + principalName
+                                                       + " not found");
                        }
-                       if (authorizable == null)
-                               throw new ArgeoException("Authorizable " + principalName
-                                               + " not found");
+                       return authorizable.getPrincipal();
                }
-               return authorizable.getPrincipal();
        }
 
        public void setGroupPrefixes(List<String> groupsToCreate) {