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

Fix MockHttpServletRequest InputStream for empty body 

Prior to this commit, a recent change applied in gh-29125 changed the
behavior of `MockHttpServletRequest` instances. In case of an empty
request body, the returned `InputStream` would be static and could not
be reused across requests.
This could result in `java.io.IOException: Stream closed` exceptions if
a previous request was read.

This commit ensures that a new instance of an empty stream is returned
for each request instance.

Fixes gh-29901
This commit is contained in:
Brian Clozel 2023-01-31 18:45:07 +01:00
parent 16937c7ce5
commit 5fd73f0bae
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 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.
@ -101,9 +101,6 @@ public class MockHttpServletRequest implements HttpServletRequest {
private static final TimeZone GMT = TimeZone.getTimeZone("GMT"); private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
private static final ServletInputStream EMPTY_SERVLET_INPUT_STREAM =
new DelegatingServletInputStream(InputStream.nullInputStream());
private static final BufferedReader EMPTY_BUFFERED_READER = private static final BufferedReader EMPTY_BUFFERED_READER =
new BufferedReader(new StringReader("")); new BufferedReader(new StringReader(""));
@ -518,7 +515,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
this.inputStream = (this.content != null ? this.inputStream = (this.content != null ?
new DelegatingServletInputStream(new ByteArrayInputStream(this.content)) : new DelegatingServletInputStream(new ByteArrayInputStream(this.content)) :
EMPTY_SERVLET_INPUT_STREAM); new DelegatingServletInputStream(InputStream.nullInputStream()));
return this.inputStream; return this.inputStream;
} }

11
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@ -82,6 +82,17 @@ class MockHttpServletRequestTests {
assertThat(StreamUtils.copyToString(request.getInputStream(), Charset.defaultCharset())).isEqualTo("body"); assertThat(StreamUtils.copyToString(request.getInputStream(), Charset.defaultCharset())).isEqualTo("body");
} }
@Test
void readEmptyInputStreamWorksAcrossRequests() throws IOException {
MockHttpServletRequest firstRequest = new MockHttpServletRequest();
firstRequest.getInputStream().readAllBytes();
firstRequest.getInputStream().close();
MockHttpServletRequest secondRequest = new MockHttpServletRequest();
secondRequest.getInputStream().readAllBytes();
secondRequest.getInputStream().close();
}
@Test @Test
void setContentAndGetReader() throws IOException { void setContentAndGetReader() throws IOException {
byte[] bytes = "body".getBytes(Charset.defaultCharset()); byte[] bytes = "body".getBytes(Charset.defaultCharset());