diff --git a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java b/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java index b29845d0d6..75433bde6b 100644 --- a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java +++ b/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java @@ -17,6 +17,7 @@ package net.sf.acegisecurity.ui; import java.io.Serializable; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** @@ -50,7 +51,9 @@ public class WebAuthenticationDetails implements Serializable { public WebAuthenticationDetails(HttpServletRequest request, boolean forceSessionCreation) { this.remoteAddress = request.getRemoteAddr(); - this.sessionId = request.getSession(forceSessionCreation).getId(); + HttpSession session = request.getSession(forceSessionCreation); + this.sessionId = session != null ? session.getId() : null; + doPopulateAdditionalInformation(request); }