X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FSimpleJcrSecurityModel.java;h=fc01587383c980a2acd6eb2fbe00769b5866cf6a;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=e564e9fd08380fc7179c03f4cf27eac3ca0be07a;hpb=69f324f4c2e115192c08f9939d8ecb74e181a34b;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java
index e564e9fd0..fc0158738 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.jcr;
 
 import java.util.List;
@@ -31,7 +46,8 @@ public class SimpleJcrSecurityModel implements JcrSecurityModel {
 	/** The home base path. */
 	private String homeBasePath = "/home";
 
-	public Node sync(Session session, String username, List<String> roles) {
+	public synchronized Node sync(Session session, String username,
+			List<String> roles) {
 		// TODO check user name validity (e.g. should not start by ROLE_)
 
 		try {
@@ -57,7 +73,7 @@ public class SimpleJcrSecurityModel implements JcrSecurityModel {
 
 			// Remote roles
 			if (roles != null) {
-				//writeRemoteRoles(userHome, roles);
+				// writeRemoteRoles(userHome, roles);
 			}
 
 			Node userProfile = UserJcrUtils.getUserProfile(session, username);
@@ -86,6 +102,12 @@ public class SimpleJcrSecurityModel implements JcrSecurityModel {
 						.getVersionManager();
 				if (versionManager.isCheckedOut(userProfile.getPath()))
 					versionManager.checkin(userProfile.getPath());
+
+			}
+
+			// Remote roles
+			if (roles != null) {
+				writeRemoteRoles(userProfile, roles);
 			}
 			return userProfile;
 		} catch (RepositoryException e) {