From 5786f6c359a6200a5d3cd8484490041a7b687e6d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 3 Feb 2009 11:24:10 +0000
Subject: [PATCH] Made threadlocals generic

---
 .../web/context/request/RequestContextHolder.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
index 0943294c4ee..e805882e6b2 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
@@ -46,10 +46,10 @@ public abstract class RequestContextHolder  {
 	private static final boolean jsfPresent =
 			ClassUtils.isPresent("javax.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
 
-	private static final ThreadLocal requestAttributesHolder = new NamedThreadLocal("Request attributes");
+	private static final ThreadLocal<RequestAttributes> requestAttributesHolder = new NamedThreadLocal<RequestAttributes>("Request attributes");
 
-	private static final ThreadLocal inheritableRequestAttributesHolder =
-			new NamedInheritableThreadLocal("Request context");
+	private static final ThreadLocal<RequestAttributes> inheritableRequestAttributesHolder =
+			new NamedInheritableThreadLocal<RequestAttributes>("Request context");
 
 
 	/**
@@ -93,9 +93,9 @@ public abstract class RequestContextHolder  {
 	 * or <code>null</code> if none bound
 	 */
 	public static RequestAttributes getRequestAttributes() {
-		RequestAttributes attributes = (RequestAttributes) requestAttributesHolder.get();
+		RequestAttributes attributes = requestAttributesHolder.get();
 		if (attributes == null) {
-			attributes = (RequestAttributes) inheritableRequestAttributesHolder.get();
+			attributes = inheritableRequestAttributesHolder.get();
 		}
 		return attributes;
 	}