Merge #3602 into 1.2.3

Signed-off-by: Violeta Georgieva <[email protected]>
reactor · Jan 22, 2025 · 4b5aaf1 · 4b5aaf1
2 parents 5c13d79 + c9e142e
commit 4b5aaf1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java
@@ -649,7 +649,7 @@ public final HttpClient cookiesWhen(String name, Function<? super Cookie, Mono<?
 		HttpClient dup = duplicate();
 		dup.configuration().deferredConf(config -> {
 			Mono<? extends Cookie> mono = cookieBuilder.apply(new DefaultCookie(name, ""));
-			return mono == Mono.<Cookie>empty() ?
+			return mono == null || mono == Mono.<Cookie>empty() ?
 					Mono.just(config) :
 					mono.map(c -> {
 						if (!c.value().isEmpty()) {
@@ -1085,7 +1085,7 @@ public final HttpClient headersWhen(Function<? super HttpHeaders, Mono<? extends
 		HttpClient dup = duplicate();
 		dup.configuration().deferredConf(config -> {
 			Mono<? extends HttpHeaders> mono = headerBuilder.apply(config.headers.copy());
-			return mono == Mono.<HttpHeaders>empty() ?
+			return mono == null || mono == Mono.<HttpHeaders>empty() ?
 					Mono.just(config) :
 					mono.map(h -> {
 						config.headers = h;