From 0f5e9ad3726ffbe5f3466d1873d29dc62e08621e Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Thu, 22 Sep 2005 01:49:12 +0000
Subject: [PATCH] Fix NPE. Thanks to Tom Dunstan.

---
 .../java/org/acegisecurity/ui/WebAuthenticationDetails.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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);
     }