|
@@ -43,9 +43,7 @@ public class WebAuthenticationDetails implements Serializable {
|
|
* @param request that the authentication request was received from
|
|
* @param request that the authentication request was received from
|
|
*/
|
|
*/
|
|
public WebAuthenticationDetails(HttpServletRequest request) {
|
|
public WebAuthenticationDetails(HttpServletRequest request) {
|
|
- this.remoteAddress = request.getRemoteAddr();
|
|
|
|
- HttpSession session = request.getSession(false);
|
|
|
|
- this.sessionId = (session != null) ? session.getId() : null;
|
|
|
|
|
|
+ this(request.getRemoteAddr(), extractSessionId(request));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -53,11 +51,16 @@ public class WebAuthenticationDetails implements Serializable {
|
|
* @param remoteAddress remote address of current request
|
|
* @param remoteAddress remote address of current request
|
|
* @param sessionId session id
|
|
* @param sessionId session id
|
|
*/
|
|
*/
|
|
- private WebAuthenticationDetails(final String remoteAddress, final String sessionId) {
|
|
|
|
|
|
+ public WebAuthenticationDetails(String remoteAddress, String sessionId) {
|
|
this.remoteAddress = remoteAddress;
|
|
this.remoteAddress = remoteAddress;
|
|
this.sessionId = sessionId;
|
|
this.sessionId = sessionId;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private static String extractSessionId(HttpServletRequest request) {
|
|
|
|
+ HttpSession session = request.getSession(false);
|
|
|
|
+ return (session != null) ? session.getId() : null;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean equals(Object obj) {
|
|
public boolean equals(Object obj) {
|
|
if (obj instanceof WebAuthenticationDetails) {
|
|
if (obj instanceof WebAuthenticationDetails) {
|