diff --git a/web/src/main/java/org/springframework/security/web/session/SessionUtils.java b/web/src/main/java/org/springframework/security/web/session/SessionUtils.java deleted file mode 100644 index f51ff20c32..0000000000 --- a/web/src/main/java/org/springframework/security/web/session/SessionUtils.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.springframework.security.web.session; - -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.security.authentication.concurrent.SessionRegistry; -import org.springframework.security.core.context.SecurityContextHolder; - -/** - * @author Luke Taylor - * @version $Id$ - * @since 2.0 - */ -public final class SessionUtils { - private final static Log logger = LogFactory.getLog(SessionUtils.class); - - SessionUtils() {} - - @SuppressWarnings("unchecked") - public static void startNewSessionIfRequired(HttpServletRequest request, boolean migrateAttributes, - SessionRegistry sessionRegistry) { - - HttpSession session = request.getSession(false); - - if (session == null) { - return; - } - - String originalSessionId = session.getId(); - - if (logger.isDebugEnabled()) { - logger.debug("Invalidating session with Id '" + originalSessionId +"' " + (migrateAttributes ? "and" : "without") + " migrating attributes."); - } - - HashMap attributesToMigrate = null; - - if (migrateAttributes) { - attributesToMigrate = new HashMap(); - - Enumeration enumer = session.getAttributeNames(); - - while (enumer.hasMoreElements()) { - String key = (String) enumer.nextElement(); - attributesToMigrate.put(key, session.getAttribute(key)); - } - } - - session.invalidate(); - session = request.getSession(true); // we now have a new session - - if (logger.isDebugEnabled()) { - logger.debug("Started new session: " + session.getId()); - } - - if (attributesToMigrate != null) { - for (Map.Entry entry : attributesToMigrate.entrySet()) { - session.setAttribute(entry.getKey(), entry.getValue()); - } - } - - if (sessionRegistry != null) { - sessionRegistry.removeSessionInformation(originalSessionId); - sessionRegistry.registerNewSession(session.getId(), - SecurityContextHolder.getContext().getAuthentication().getPrincipal()); - } - } -}