Fix issue with default workspace

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jackrabbit / src / main / java / org / argeo / jackrabbit / remote / SimpleSessionProvider.java

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 0cf59d5f9d629f71ace82e5588a9ccc15b9682b1..ebd111c0ba7a921bde551e4853d90cd7046f0fb5 100644 (file)
--- 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
@@ -51,7 +51,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 +64,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()