From e4ae8d44f3d3c6b57ce6df7ea31d6c1fb10bd8ee Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 15 Feb 2022 07:00:35 +0100 Subject: [PATCH] Fix remote auth session --- .../src/org/argeo/cms/servlet/ServletHttpRequest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.30.2