Fix Remote RCP not working

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / jcr / SimpleJcrSecurityModel.java

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 e564e9fd08380fc7179c03f4cf27eac3ca0be07a..fc01587383c980a2acd6eb2fbe00769b5866cf6a 100644 (file)
--- 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) {