From d0ada5653f02954c7d1b5014e798400e6846828e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Tue, 18 Sep 2018 11:20:33 +0200
Subject: [PATCH] Polish

See: SPR-17054
---
 .../web/reactive/function/BodyExtractors.java        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
index 53f61e0666..afeaf09628 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
@@ -200,7 +200,7 @@ public abstract class BodyExtractors {
 	private static <T> Supplier<Flux<T>> skipBodyAsFlux(ReactiveHttpInputMessage message,
 			BodyExtractor.Context context) {
 
-		if (isExtractingForClient(message, context)) {
+		if (isExtractingForClient(message)) {
 			return () -> consumeAndCancel(message).thenMany(Flux.empty());
 		}
 		else {
@@ -211,7 +211,7 @@ public abstract class BodyExtractors {
 	private static <T> Supplier<Mono<T>> skipBodyAsMono(ReactiveHttpInputMessage message,
 			BodyExtractor.Context context) {
 
-		if (isExtractingForClient(message, context)) {
+		if (isExtractingForClient(message)) {
 			return () -> consumeAndCancel(message).then(Mono.empty());
 		}
 		else {
@@ -259,7 +259,7 @@ public abstract class BodyExtractors {
 		else {
 			result = Flux.error(ex);
 		}
-		return isExtractingForClient(inputMessage, context) ?
+		return isExtractingForClient(inputMessage) ?
 				consumeAndCancel(inputMessage).thenMany(result) : result;
 	}
 
@@ -279,10 +279,8 @@ public abstract class BodyExtractors {
 		return (HttpMessageReader<T>) reader;
 	}
 
-	private static boolean isExtractingForClient(ReactiveHttpInputMessage message,
-			BodyExtractor.Context context) {
-		return !context.serverResponse().isPresent()
-				&& message instanceof ClientHttpResponse;
+	private static boolean isExtractingForClient(ReactiveHttpInputMessage message) {
+		return message instanceof ClientHttpResponse;
 	}
 
 	private static Mono<Void> consumeAndCancel(ReactiveHttpInputMessage message) {