From 2f3deb06b23061cb2fbe7202cf266cd353beec76 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Fri, 27 Mar 2009 17:40:48 +0000
Subject: [PATCH] XW-620  Cleanup all ThreadLocal references on context
 shutdown

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@759279 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/struts2/dispatcher/Dispatcher.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index a26997fbd..3b69a5928 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -287,6 +287,9 @@ public class Dispatcher {
         	interceptor.destroy();
         }
 
+        //cleanup action context
+        ActionContext.setContext(null);
+
         // clean up configuration
     	configurationManager.destroyConfiguration();
     	configurationManager = null;