From a8b7a5e037e6d2452a81b3050923096e2be51f75 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Fri, 31 Mar 2023 15:40:46 +0800
Subject: [PATCH] Refine initRequestBuilder in DefaultWebClient

Closes gh-30254
---
 .../web/reactive/function/client/DefaultWebClient.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
index a675dba7019..dffd076293e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
@@ -433,9 +433,7 @@ class DefaultWebClient implements WebClient {
 		@SuppressWarnings("deprecation")
 		public Mono<ClientResponse> exchange() {
 			ClientRequestObservationContext observationContext = new ClientRequestObservationContext();
-			ClientRequest.Builder requestBuilder = this.inserter != null ?
-					initRequestBuilder().body(this.inserter) :
-					initRequestBuilder();
+			ClientRequest.Builder requestBuilder = initRequestBuilder();
 			return Mono.deferContextual(contextView -> {
 				Observation observation = ClientHttpObservationDocumentation.HTTP_REACTIVE_CLIENT_EXCHANGES.observation(observationConvention,
 						DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, observationRegistry);
@@ -479,6 +477,9 @@ class DefaultWebClient implements WebClient {
 			if (this.httpRequestConsumer != null) {
 				builder.httpRequest(this.httpRequestConsumer);
 			}
+			if (this.inserter != null) {
+				builder.body(this.inserter);
+			}
 			return builder;
 		}