From b0d14cea04b780e0b09cedfd51142a43e823a238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Gielen?= <rgielen@apache.org>
Date: Thu, 22 Mar 2012 21:17:07 +0000
Subject: [PATCH] WW-3768: ThreadLocal was created but not removed
 appropriately

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1304070 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/com/opensymphony/xwork2/inject/ContainerImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java b/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
index ea62dd03c..768189e0a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
@@ -581,6 +581,8 @@ class ContainerImpl implements Container {
 			} finally {
 				// Only remove the context if this call created it.
 				reference[0] = null;
+				// WW-3768: ThreadLocal was not removed
+				localContext.remove();
 			}
 		} else {
 			// Someone else will clean up this context.