X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Forg.argeo.cms.servlet%2Fsrc%2Forg%2Fargeo%2Fcms%2Fservlet%2FServletHttpRequest.java;h=54c8804359429724746b076ddd8aa7e88b13e50c;hb=e4ae8d44f3d3c6b57ce6df7ea31d6c1fb10bd8ee;hp=95912e407ceffae4a4b1af2e104246bf3a3efc2a;hpb=820bdbaef7c69ad478b780ae4241e19563d771ca;p=lgpl%2Fargeo-commons.git diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java b/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java index 95912e407..54c880435 100644 --- a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java +++ b/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java @@ -4,6 +4,7 @@ import java.util.Locale; import java.util.Objects; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.argeo.cms.auth.RemoteAuthRequest; import org.argeo.cms.auth.RemoteAuthSession; @@ -18,7 +19,10 @@ public class ServletHttpRequest implements RemoteAuthRequest { @Override public RemoteAuthSession getSession() { - return new ServletHttpSession(request.getSession(false)); + HttpSession httpSession = request.getSession(false); + if (httpSession == null) + return null; + return new ServletHttpSession(httpSession); } @Override