X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2Fremote%2FSimpleSessionProvider.java;h=12315930b61995cca0fc48625da9e845252592b3;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=0cf59d5f9d629f71ace82e5588a9ccc15b9682b1;hpb=e9a9b6690808723800226bde4280d4f693035a2e;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java index 0cf59d5f9..12315930b 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2007-2012 Mathieu Baudier + * + * 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.jackrabbit.remote; import java.io.Serializable; @@ -51,7 +66,7 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { if (openSessionInView) { JackrabbitSession session = (JackrabbitSession) rep .login(workspace); - if (!workspace.equals(securityWorkspace)) + if (session.getWorkspace().getName().equals(securityWorkspace)) writeRemoteRoles(session); return session; } else { @@ -64,7 +79,8 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { try { JackrabbitSession session = (JackrabbitSession) rep.login( null, workspace); - if (!workspace.equals(securityWorkspace)) + if (session.getWorkspace().getName() + .equals(securityWorkspace)) writeRemoteRoles(session); if (log.isTraceEnabled()) log.trace("User " + session.getUserID()