Merge branch '6.1.x'

This commit is contained in:
Sébastien Deleuze
2024-08-19 10:46:54 +02:00

View File

@@ -71,6 +71,7 @@ import org.springframework.web.util.UriBuilderFactory;
* @author Rossen Stoyanchev
* @author Sam Brannen
* @author Michał Rowicki
* @author Sebastien Deleuze
* @since 5.0
*/
class DefaultWebTestClient implements WebTestClient {
@@ -506,7 +507,14 @@ class DefaultWebTestClient implements WebTestClient {
@Override
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);
}