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

Prevent a leak in WebTestClient 

This commit applies the same kind of processing for
Void.class element type in the ParameterizedTypeReference
variant of WebTestClient.ResponseSpec#returnResult than
in the Class variant.

Closes gh-33389
This commit is contained in:
Sébastien Deleuze 2024-08-19 10:46:47 +02:00
parent d41ca095ab
commit 0101945708
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 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.
@ -66,6 +66,7 @@ import org.springframework.web.util.UriBuilderFactory;
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sam Brannen * @author Sam Brannen
* @author Michał Rowicki * @author Michał Rowicki
* @author Sebastien Deleuze
* @since 5.0 * @since 5.0
*/ */
class DefaultWebTestClient implements WebTestClient { class DefaultWebTestClient implements WebTestClient {
@ -490,7 +491,14 @@ class DefaultWebTestClient implements WebTestClient {
@Override @Override
public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef) { public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef) {
Flux<T> body = this.response.bodyToFlux(elementTypeRef); Flux<T> body;
if (elementTypeRef.getType().equals(Void.class)) {
this.response.releaseBody().block();
body = Flux.empty();
}
else {
body = this.response.bodyToFlux(elementTypeRef);
}
return new FluxExchangeResult<>(this.exchangeResult, body); return new FluxExchangeResult<>(this.exchangeResult, body);
} }