X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitAuthorizations.java;h=e880b6700fcbfb85c405be766c5d9561c22f5236;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=d33f886a89ffd7bb3636c20b0817727e032d138d;hpb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;p=lgpl%2Fargeo-commons.git

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 d33f886a8..e880b6700 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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) {