root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

added filter ordering comments (SPR-6594)

This commit is contained in:
Juergen Hoeller 2010-03-30 10:46:51 +00:00
parent 2c9753ad25
commit 0eabef0720
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
View File

@ -38,6 +38,11 @@ import org.springframework.util.StringUtils;
* <p>The name of the request parameter defaults to <code>_method</code>, but can be * <p>The name of the request parameter defaults to <code>_method</code>, but can be
* changed via the {@link #setMethodParam(String) methodParam} property. * changed via the {@link #setMethodParam(String) methodParam} property.
* *
* <p><b>NOTE: This filter needs to run after multipart processing in case of a multipart
* POST request, due to its inherent need for checking a POST body parameter.</b>
* So typically, put a Spring {@link org.springframework.web.multipart.support.MultipartFilter}
* <i>before</i> this HiddenHttpMethodFilter in your <code>web.xml</code> filter chain.
*
* @author Arjen Poutsma * @author Arjen Poutsma
* @since 3.0 * @since 3.0
*/ */

17
org.springframework.web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,6 @@
package org.springframework.web.multipart.support; package org.springframework.web.multipart.support;
import java.io.IOException; import java.io.IOException;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -46,9 +45,10 @@ import org.springframework.web.multipart.MultipartResolver;
* for each call but rather return a reference to a pre-built instance. * for each call but rather return a reference to a pre-built instance.
* *
* <p>Note: This filter is an <b>alternative</b> to using DispatcherServlet's * <p>Note: This filter is an <b>alternative</b> to using DispatcherServlet's
* MultipartResolver support, for example for web applications with custom * MultipartResolver support, for example for web applications with custom web views
* web views that do not use Spring's web MVC. It should not be combined with * which do not use Spring's web MVC, or for custom filters applied before a Spring MVC
* servlet-specific multipart resolution. * DispatcherServlet (e.g. {@link org.springframework.web.filter.HiddenHttpMethodFilter}).
* In any case, this filter should not be combined with servlet-specific multipart resolution.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 08.10.2003 * @since 08.10.2003
@ -77,7 +77,7 @@ public class MultipartFilter extends OncePerRequestFilter {
* root application context. * root application context.
*/ */
protected String getMultipartResolverBeanName() { protected String getMultipartResolverBeanName() {
return multipartResolverBeanName; return this.multipartResolverBeanName;
} }
@ -143,9 +143,8 @@ public class MultipartFilter extends OncePerRequestFilter {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Using MultipartResolver '" + getMultipartResolverBeanName() + "' for MultipartFilter"); logger.debug("Using MultipartResolver '" + getMultipartResolverBeanName() + "' for MultipartFilter");
} }
WebApplicationContext wac = WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); return wac.getBean(getMultipartResolverBeanName(), MultipartResolver.class);
return (MultipartResolver) wac.getBean(getMultipartResolverBeanName(), MultipartResolver.class);
} }
} }