spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 14:09:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
This commit is contained in:
Juergen Hoeller
2025-11-02 20:42:43 +01:00
parent 2b526efe65 4b7cf85d71
commit 29a76a6c70
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
+12 -4
View File
@@ -31,13 +31,14 @@ import org.springframework.util.StreamUtils;
* into memory, thus allowing for multiple invocations of {@link #getBody()}.
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 3.1
*/
final class BufferingClientHttpResponseWrapper implements ClientHttpResponse {
private final ClientHttpResponse response;
private byte @Nullable [] body;
private volatile byte @Nullable [] body;
BufferingClientHttpResponseWrapper(ClientHttpResponse response) {
@@ -62,10 +63,17 @@ final class BufferingClientHttpResponseWrapper implements ClientHttpResponse {
@Override
public InputStream getBody() throws IOException {
if (this.body == null) {
this.body = StreamUtils.copyToByteArray(this.response.getBody());
byte[] body = this.body;
if (body == null) {
synchronized (this) {
body = this.body;
if (body == null) {
body = StreamUtils.copyToByteArray(this.response.getBody());
this.body = body;
}
}
}
return new ByteArrayInputStream(this.body);
return new ByteArrayInputStream(body);
}
@Override