mirror of
https://github.com/apache/struts.git
synced 2026-08-11 01:27:14 +00:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user