From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 6 Nov 2011 21:14:21 +0000 (+0000)
Subject: Fix issue with default workspace
X-Git-Tag: argeo-commons-2.1.30~1072
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=2ba7cb08946a79978e74b8e1c1d04fe607450505;hp=84ff63026b2e6b96132c02136e7dd633379e1833;p=lgpl%2Fargeo-commons.git

Fix issue with default workspace

git-svn-id: https://svn.argeo.org/commons/trunk@4896 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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..ebd111c0b 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
@@ -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()