Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

preserve custom pre-bound RequestAttributes implementations (for Grails)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-07-08 15:11:15 +00:00
parent 68e07239c7
commit 5ff6191d72
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -80,8 +80,8 @@ public class RequestContextListener implements ServletRequestListener {
if (attributes == null) {
attributes = threadAttributes;
}
RequestContextHolder.resetRequestAttributes();
LocaleContextHolder.resetLocaleContext();
RequestContextHolder.resetRequestAttributes();
}
if (attributes != null) {
attributes.requestCompleted();

5
org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.springframework.web.filter;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -84,8 +83,8 @@ public class RequestContextFilter extends OncePerRequestFilter {
filterChain.doFilter(request, response);
}
finally {
RequestContextHolder.resetRequestAttributes();
LocaleContextHolder.resetLocaleContext();
RequestContextHolder.resetRequestAttributes();
attributes.requestCompleted();
if (logger.isDebugEnabled()) {
logger.debug("Cleared thread-bound request context: " + request);