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

RequestResponseBodyMethodProcessor decorates ServletInputStream as well 

Issue: SPR-13014
This commit is contained in:
Juergen Hoeller 2015-05-11 21:52:30 +02:00
parent 89694b009a
commit a899e066f2
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
View File

@ -21,7 +21,9 @@ import java.io.InputStream;
import java.io.PushbackInputStream; import java.io.PushbackInputStream;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.List; import java.util.List;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import org.springframework.core.Conventions; import org.springframework.core.Conventions;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
@ -137,7 +139,23 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter
else { else {
pushbackInputStream.unread(b); pushbackInputStream.unread(b);
} }
inputMessage = new ServletServerHttpRequest(servletRequest) { HttpServletRequest wrappedRequest = new HttpServletRequestWrapper(servletRequest) {
@Override
public ServletInputStream getInputStream() throws IOException {
return new ServletInputStream() {
@Override
public int read() throws IOException {
return pushbackInputStream.read();
}
@Override
public void close() throws IOException {
super.close();
pushbackInputStream.close();
}
};
}
};
inputMessage = new ServletServerHttpRequest(wrappedRequest) {
@Override @Override
public InputStream getBody() { public InputStream getBody() {
// Form POST should not get here // Form POST should not get here