Skip to content

Commit 94d8fc7

Browse files
committed
Merge branch '6.1.x'
2 parents eb7a95c + 0101945 commit 94d8fc7

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
* @author Rossen Stoyanchev
7272
* @author Sam Brannen
7373
* @author Michał Rowicki
74+
* @author Sebastien Deleuze
7475
* @since 5.0
7576
*/
7677
class DefaultWebTestClient implements WebTestClient {
@@ -506,7 +507,14 @@ public <T> FluxExchangeResult<T> returnResult(Class<T> elementClass) {
506507

507508
@Override
508509
public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef) {
509-
Flux<T> body = this.response.bodyToFlux(elementTypeRef);
510+
Flux<T> body;
511+
if (elementTypeRef.getType().equals(Void.class)) {
512+
this.response.releaseBody().block();
513+
body = Flux.empty();
514+
}
515+
else {
516+
body = this.response.bodyToFlux(elementTypeRef);
517+
}
510518
return new FluxExchangeResult<>(this.exchangeResult, body);
511519
}
512520

0 commit comments

Comments
 (0)