Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FilterDispatcher not always calling ActionContextCleanUp.cleanUp(Request)

Browse Source 
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
This commit is contained in:
Rainer Hermanns
2007-04-19 15:00:20 +00:00
parent 13b136c559
commit 6a46ca7fcd
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+6 -7
View File
@@ -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);
}
}
/**