X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fhttp%2FCmsSessionProvider.java;h=14f311f3796903721987b8c197f8cd4d3f0ca690;hb=2afabd9e7b225f80b341063e25188314394c9aef;hp=85390e62eeb414d9c0918ca6de106826da09c8bc;hpb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
index 85390e62e..14f311f37 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
@@ -1,7 +1,6 @@
 package org.argeo.cms.internal.http;
 
 import java.io.Serializable;
-import java.util.LinkedHashMap;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -19,14 +18,14 @@ import org.argeo.jcr.JcrUtils;
  * Implements an open session in view patter: a new JCR session is created for
  * each request
  */
-class CmsSessionProvider implements SessionProvider, Serializable {
+public class CmsSessionProvider implements SessionProvider, Serializable {
 	private static final long serialVersionUID = -1358136599534938466L;
 
 	private final static Log log = LogFactory.getLog(CmsSessionProvider.class);
 
 	private final String alias;
 
-	private LinkedHashMap<Session, CmsSessionImpl> cmsSessions = new LinkedHashMap<>();
+//	private LinkedHashMap<Session, CmsSessionImpl> cmsSessions = new LinkedHashMap<>();
 
 	public CmsSessionProvider(String alias) {
 		this.alias = alias;
@@ -35,47 +34,27 @@ class CmsSessionProvider implements SessionProvider, Serializable {
 	public Session getSession(HttpServletRequest request, Repository rep, String workspace)
 			throws javax.jcr.LoginException, ServletException, RepositoryException {
 
-		CmsSessionImpl cmsSession = (CmsSessionImpl) WebCmsSessionImpl.getCmsSession(request);
-		// if (cmsSession == null)
-		// return anonymousSession(request, rep, workspace);
+		// a client is scanning parent URLs.
+		if (workspace == null)
+			return null;
+
+		CmsSessionImpl cmsSession = WebCmsSessionImpl.getCmsSession(request);
 		if (log.isTraceEnabled()) {
-			log.debug("Get JCR session from " + cmsSession);
+			log.trace("Get JCR session from " + cmsSession);
 		}
-		Session session = cmsSession.getDataSession(alias, workspace, rep);
-		cmsSessions.put(session, cmsSession);
+		Session session = cmsSession.newDataSession(alias, workspace, rep);
+//		cmsSessions.put(session, cmsSession);
 		return session;
 	}
 
-	// private synchronized Session anonymousSession(HttpServletRequest request,
-	// Repository repository, String workspace) {
-	// // TODO rather log in here as anonymous?
-	// LoginContext lc = (LoginContext)
-	// request.getAttribute(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
-	// if (lc == null)
-	// throw new CmsException("No login context available");
-	// // optimize
-	// Session session;
-	// try {
-	// session = Subject.doAs(lc.getSubject(), new
-	// PrivilegedExceptionAction<Session>() {
-	// @Override
-	// public Session run() throws Exception {
-	// return repository.login(workspace);
-	// }
-	// });
-	// } catch (Exception e) {
-	// throw new CmsException("Cannot log in to JCR", e);
-	// }
-	// return session;
-	// }
-
-	public synchronized void releaseSession(Session session) {
-		if (cmsSessions.containsKey(session)) {
-			CmsSessionImpl cmsSession = cmsSessions.get(session);
-			cmsSession.releaseDataSession(alias, session);
-		} else {
-			log.warn("JCR session " + session + " not found in CMS session list. Logging it out...");
-			JcrUtils.logoutQuietly(session);
-		}
+	public void releaseSession(Session session) {
+		JcrUtils.logoutQuietly(session);
+//		if (cmsSessions.containsKey(session)) {
+//			CmsSessionImpl cmsSession = cmsSessions.get(session);
+//			cmsSession.releaseDataSession(alias, session);
+//		} else {
+//			log.warn("JCR session " + session + " not found in CMS session list. Logging it out...");
+//			JcrUtils.logoutQuietly(session);
+//		}
 	}
 }