X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2FAbstractCmsEntryPoint.java;h=22a2ba3e1dbec9f6c74fe922b822c9845eb0256d;hb=9653b07ad7c6a73be1b1c1d8ce079e319727362d;hp=9f7811aa4d0d08a5c57919c3eb9a03b11fc29e6e;hpb=a444205e81419d439635a9e0ff3382ae3f5d9947;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
index 9f7811aa4..22a2ba3e1 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
@@ -12,7 +12,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.security.auth.Subject;
-import javax.security.auth.login.CredentialNotFoundException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
@@ -73,17 +72,15 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		// Initial login
 		try {
 			loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-					new HttpRequestCallbackHandler(UiContext.getHttpRequest()));
+					new HttpRequestCallbackHandler(UiContext.getHttpRequest(), UiContext.getHttpResponse()));
 			loginContext.login();
-		} catch (CredentialNotFoundException e) {
+		} catch (LoginException e) {
 			try {
 				loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER);
 				loginContext.login();
 			} catch (LoginException e1) {
 				throw new CmsException("Cannot log in as anonymous", e1);
 			}
-		} catch (LoginException e) {
-			throw new CmsException("Cannot initialize subject", e);
 		}
 		authChange(loginContext);
 
@@ -179,7 +176,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 			anonymousLc.login();
 			authChange(anonymousLc);
 		} catch (LoginException e) {
-			throw new CmsException("Cannot logout", e);
+			log.error("Cannot logout", e);
 		}
 	}