From 92184a6850fdffb6d543bc85e26f058c2fd6a0ea Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Sun, 25 Feb 2007 05:35:51 +0000 Subject: [PATCH] WW-1733 Fixed request not being wrapped issue (merged from 2.0.x branch) git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@511454 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts2/dispatcher/FilterDispatcher.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 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 7bb865689..e14c12354 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -320,20 +320,20 @@ public class FilterDispatcher implements StrutsStatics, Filter { // prepare the request no matter what - this ensures that the proper character encoding // is used before invoking the mapper (see WW-9127) dispatcher.prepare(request, response); - - try { - // Wrap request first, just in case it is multipart/form-data - // parameters might not be accessible through before encoding (ww-1278) - request = dispatcher.wrapRequest(request, getServletContext()); - } catch (IOException e) { - String message = "Could not wrap servlet request with MultipartRequestWrapper!"; - LOG.error(message, e); - throw new ServletException(message, e); - } - } - else { + } else { dispatcher = du; } + + try { + // Wrap request first, just in case it is multipart/form-data + // parameters might not be accessible through before encoding (ww-1278) + request = dispatcher.wrapRequest(request, getServletContext()); + } catch (IOException e) { + String message = "Could not wrap servlet request with MultipartRequestWrapper!"; + LOG.error(message, e); + throw new ServletException(message, e); + } + return request; }