Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor debugging optimizations.

This commit is contained in:
Luke Taylor 2009-04-30 05:21:54 +00:00
parent 39cc865a36
commit 6db9a3facc
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java
View File

@ -116,8 +116,10 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo
* @param httpSession the session obtained from the request. * @param httpSession the session obtained from the request.
*/ */
private SecurityContext readSecurityContextFromSession(HttpSession httpSession) { private SecurityContext readSecurityContextFromSession(HttpSession httpSession) {
final boolean debug = logger.isDebugEnabled();
if (httpSession == null) { if (httpSession == null) {
if (logger.isDebugEnabled()) { if (debug) {
logger.debug("No HttpSession currently exists"); logger.debug("No HttpSession currently exists");
} }
@ -129,7 +131,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo
Object contextFromSession = httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY); Object contextFromSession = httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY);
if (contextFromSession == null) { if (contextFromSession == null) {
if (logger.isDebugEnabled()) { if (debug) {
logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT"); logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT");
} }
@ -153,7 +155,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo
contextFromSession = cloneContext(contextFromSession); contextFromSession = cloneContext(contextFromSession);
} }
if (logger.isDebugEnabled()) { if (debug) {
logger.debug("Obtained a valid SecurityContext from SPRING_SECURITY_CONTEXT: '" + contextFromSession + "'"); logger.debug("Obtained a valid SecurityContext from SPRING_SECURITY_CONTEXT: '" + contextFromSession + "'");
} }

14
web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
View File

@ -16,8 +16,9 @@ import org.springframework.security.web.SpringSecurityFilter;
/** /**
* Populates the {@link SecurityContextHolder} with information obtained from * Populates the {@link SecurityContextHolder} with information obtained from
* the configured {@link SecurityContextRepository} prior to the request and stores it back in the repository * the configured {@link SecurityContextRepository} prior to the request and stores it back in the repository
* once the request has completed. By default it uses an {@link HttpSessionSecurityContextRepository}. See this * once the request has completed and clearing the context holder. By default it uses an
* class for information <tt>HttpSession</tt> related configuration options. * {@link HttpSessionSecurityContextRepository}. See this class for information <tt>HttpSession</tt> related
* configuration options.
* <p> * <p>
* This filter will only execute once per request, to resolve servlet container (specifically Weblogic) * This filter will only execute once per request, to resolve servlet container (specifically Weblogic)
* incompatibilities. * incompatibilities.
@ -55,11 +56,16 @@ public class SecurityContextPersistenceFilter extends SpringSecurityFilter {
return; return;
} }
final boolean debug = logger.isDebugEnabled();
request.setAttribute(FILTER_APPLIED, Boolean.TRUE); request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
if (forceEagerSessionCreation) { if (forceEagerSessionCreation) {
HttpSession session = request.getSession(); HttpSession session = request.getSession();
logger.debug("Eagerly created session: " + session.getId());
if (debug && session.isNew()) {
logger.debug("Eagerly created session: " + session.getId());
}
} }
HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
@ -77,7 +83,7 @@ public class SecurityContextPersistenceFilter extends SpringSecurityFilter {
repo.saveContext(contextAfterChainExecution, holder.getRequest(), holder.getResponse()); repo.saveContext(contextAfterChainExecution, holder.getRequest(), holder.getResponse());
request.removeAttribute(FILTER_APPLIED); request.removeAttribute(FILTER_APPLIED);
if (logger.isDebugEnabled()) { if (debug) {
logger.debug("SecurityContextHolder now cleared, as request processing completed"); logger.debug("SecurityContextHolder now cleared, as request processing completed");
} }
} }