X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FJcrContentProvider.java;h=7f471c9b0d656a694482076df38872fb95de098d;hb=7e464c3cedfa41ece64811fb55ddc9ce740a1050;hp=235e27d1a922139558d8e8c42da322199340dda5;hpb=e41a5f598aa4692ee4109e5442e5fcd8565e98bd;p=lgpl%2Fargeo-commons.git

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
index 235e27d1a..7f471c9b0 100644
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
@@ -16,7 +16,6 @@ import org.argeo.api.acr.Content;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.cms.acr.CmsContentRepository;
 import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrException;
@@ -24,6 +23,8 @@ import org.argeo.jcr.JcrUtils;
 
 /** A JCR workspace accessed as an {@link ContentProvider}. */
 public class JcrContentProvider implements ContentProvider, NamespaceContext {
+	public final static String ACR_MOUNT_PATH_PROPERTY = "acr.mount.path";
+
 	private Repository jcrRepository;
 	private Session adminSession;
 
@@ -32,7 +33,7 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	private Map<ProvidedSession, JcrSessionAdapter> sessionAdapters = Collections.synchronizedMap(new HashMap<>());
 
 	public void start(Map<String, String> properties) {
-		mountPath = properties.get(CmsContentRepository.ACR_MOUNT_PATH_PROPERTY);
+		mountPath = properties.get(ACR_MOUNT_PATH_PROPERTY);
 		if ("/".equals(mountPath))
 			throw new IllegalArgumentException("JCR content provider cannot be root /");
 		Objects.requireNonNull(mountPath);
@@ -40,7 +41,8 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	}
 
 	public void stop() {
-		JcrUtils.logoutQuietly(adminSession);
+		if (adminSession.isLive())
+			JcrUtils.logoutQuietly(adminSession);
 	}
 
 	public void setJcrRepository(Repository jcrRepository) {