Fix remote auth session

[lgpl/argeo-commons.git] / eclipse / org.argeo.cms.servlet / src / org / argeo / cms / servlet / ServletHttpRequest.java

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 95912e407ceffae4a4b1af2e104246bf3a3efc2a..54c8804359429724746b076ddd8aa7e88b13e50c 100644 (file)
--- 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