Reuse data sessions.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / http / CmsSessionProvider.java

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 4f0c184dbc1b392031b3150a4aa7e8a2b72ccde1..a6ed7d884f43fd862476d44d2a213b981b883efc 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
@@ -19,7 +19,7 @@ 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);
@@ -35,41 +35,21 @@ class CmsSessionProvider implements SessionProvider, Serializable {
        public Session getSession(HttpServletRequest request, Repository rep, String workspace)
                        throws javax.jcr.LoginException, ServletException, RepositoryException {
 
+               // a client is scanning parent URLs.
+//             if (workspace == null)
+//                     return null;
+
                CmsSessionImpl cmsSession = WebCmsSessionImpl.getCmsSession(request);
-               // if (cmsSession == null)
-               // return anonymousSession(request, rep, workspace);
                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);
                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) {
+       public void releaseSession(Session session) {
+//             JcrUtils.logoutQuietly(session);
                if (cmsSessions.containsKey(session)) {
                        CmsSessionImpl cmsSession = cmsSessions.get(session);
                        cmsSession.releaseDataSession(alias, session);