From 6a46ca7fcd172fda273a1506ebe06dda5936c461 Mon Sep 17 00:00:00 2001 From: Rainer Hermanns Date: Thu, 19 Apr 2007 15:00:20 +0000 Subject: [PATCH] FilterDispatcher not always calling ActionContextCleanUp.cleanUp(Request) o applied patch submitted by Jasper Rosenberg Issue Number: WW-1816 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@530439 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/struts2/dispatcher/FilterDispatcher.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java index f6bd2258c..313e643a9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -379,7 +379,7 @@ public class FilterDispatcher implements StrutsStatics, Filter { */ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - + HttpServletRequest request = (HttpServletRequest) req; HttpServletResponse response = (HttpServletResponse) res; ServletContext servletContext = getServletContext(); @@ -394,7 +394,6 @@ public class FilterDispatcher implements StrutsStatics, Filter { } catch (Exception ex) { LOG.error("error getting ActionMapping", ex); dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex); - ActionContextCleanUp.cleanUp(req); return; } @@ -417,15 +416,15 @@ public class FilterDispatcher implements StrutsStatics, Filter { return; } + dispatcher.serviceAction(request, response, servletContext, mapping); + + } finally { try { - dispatcher.serviceAction(request, response, servletContext, mapping); - } finally { ActionContextCleanUp.cleanUp(req); + } finally { + UtilTimerStack.pop(timerKey); } } - finally { - UtilTimerStack.pop(timerKey); - } } /**