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

fixed JodaTimeContextHolder to use a non-inheritable ThreadLocal and expose a reset method (SPR-7441); use of remove() even when being called with a null argument

Browse Source
This commit is contained in:
Juergen Hoeller
2010-10-11 18:55:21 +00:00
parent c046419acd
commit ae3cfff380
3 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
View File

@@ -24,7 +24,9 @@ import org.springframework.util.ClassUtils;
/**
* Holder class to expose the web request in the form of a thread-bound
* {@link RequestAttributes} object.
* {@link RequestAttributes} object. The request will be inherited
* by any child threads spawned by the current thread if the
* <code>inheritable<code> flag is set to <code>true</code>.
*
* <p>Use {@link RequestContextListener} or
* {@link org.springframework.web.filter.RequestContextFilter} to expose
@@ -73,18 +75,24 @@ public abstract class RequestContextHolder {
/**
* Bind the given RequestAttributes to the current thread.
* @param attributes the RequestAttributes to expose
* @param attributes the RequestAttributes to expose,
* or <code>null</code> to reset the thread-bound context
* @param inheritable whether to expose the RequestAttributes as inheritable
* for child threads (using an {@link java.lang.InheritableThreadLocal})
*/
public static void setRequestAttributes(RequestAttributes attributes, boolean inheritable) {
if (inheritable) {
inheritableRequestAttributesHolder.set(attributes);
requestAttributesHolder.remove();
if (attributes == null) {
resetRequestAttributes();
}
else {
requestAttributesHolder.set(attributes);
inheritableRequestAttributesHolder.remove();
if (inheritable) {
inheritableRequestAttributesHolder.set(attributes);
requestAttributesHolder.remove();
}
else {
requestAttributesHolder.set(attributes);
inheritableRequestAttributesHolder.remove();
}
}
}