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

fixed DispatcherServletTests breakage

This commit is contained in:
Juergen Hoeller 2011-07-20 21:04:29 +00:00
parent 571535352b
commit 2d7af57149
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
View File

@ -37,6 +37,7 @@ import org.springframework.context.ApplicationListener;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.context.support.ApplicationObjectSupport; import org.springframework.context.support.ApplicationObjectSupport;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.http.HttpHeaders;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.ServletRequestBindingException; import org.springframework.web.bind.ServletRequestBindingException;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
@ -48,7 +49,7 @@ import org.springframework.web.multipart.MaxUploadSizeExceededException;
import org.springframework.web.multipart.MultipartException; import org.springframework.web.multipart.MultipartException;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest; import org.springframework.web.multipart.support.AbstractMultipartHttpServletRequest;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
import org.springframework.web.servlet.handler.SimpleServletHandlerAdapter; import org.springframework.web.servlet.handler.SimpleServletHandlerAdapter;
import org.springframework.web.servlet.handler.SimpleServletPostProcessor; import org.springframework.web.servlet.handler.SimpleServletPostProcessor;
@ -433,7 +434,14 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
throw new IllegalStateException("Already resolved"); throw new IllegalStateException("Already resolved");
} }
request.setAttribute("resolved", Boolean.TRUE); request.setAttribute("resolved", Boolean.TRUE);
return new DefaultMultipartHttpServletRequest(request); return new AbstractMultipartHttpServletRequest(request) {
public HttpHeaders getMultipartHeaders(String paramOrFileName) {
return null;
}
public String getMultipartContentType(String paramOrFileName) {
return null;
}
};
} }
public void cleanupMultipart(MultipartHttpServletRequest request) { public void cleanupMultipart(MultipartHttpServletRequest request) {