From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 23 Sep 2022 07:01:17 +0000 (+0200)
Subject: Documentation
X-Git-Tag: v2.3.10~27
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=70f045c8ca8dbbd117d5a80ff57975069641079a

Documentation
---

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
index 3be8be184..1f1fa1121 100644
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
@@ -1144,6 +1144,14 @@ public class JcrUtils {
 				// try to create workspace
 				defaultSession = repository.login(credentials);
 				defaultSession.getWorkspace().createWorkspace(workspaceName);
+
+				// work around non-atomicity of workspace creation in Jackrabbit
+//				try {
+//					Thread.sleep(5000);
+//				} catch (InterruptedException e1) {
+//					// ignore
+//				}
+				
 				workspaceSession = repository.login(credentials, workspaceName);
 			}
 			return workspaceSession;
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
index c8e137ee9..a8a322356 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -94,7 +94,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 
 	// ALL USER: WARNING access to this will be later reduced
 
-	/** Retrieve a user given his dn */
+	/** Retrieve a user given his dn, or <code>null</code> if it doesn't exist. */
 	public User getUser(String dn) {
 		return (User) getUserAdmin().getRole(dn);
 	}
@@ -139,8 +139,6 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		addUsers(users, group, filter);
 		return users;
 	}
-	
-	
 
 //	@Override
 //	public Set<User> listAccounts(HierarchyUnit hierarchyUnit, boolean deep) {
@@ -184,7 +182,8 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		List<User> users = new ArrayList<User>();
 		for (Role role : roles) {
 			if ((includeUsers && role.getType() == Role.USER || role.getType() == Role.GROUP) && !users.contains(role)
-					&& (includeSystemRoles || !role.getName().toLowerCase().endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))) {
+					&& (includeSystemRoles
+							|| !role.getName().toLowerCase().endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))) {
 				if (match(role, filter))
 					users.add((User) role);
 			}