Merge branch '6.1.x'

sdeleuze · Oct 18, 2024 · e02f8ca · e02f8ca
2 parents 5abe5e1 + 73fd913
commit e02f8ca
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.../src/main/java/org/springframework/http/client/reactive/ReactorNetty2ResourceFactory.java b/.../src/main/java/org/springframework/http/client/reactive/ReactorNetty2ResourceFactory.java
@@ -107,8 +107,9 @@ public void addGlobalResourcesConsumer(Consumer<HttpResources> consumer) {
 	 * Use this when you don't want to participate in global resources and
 	 * you want to customize the creation of the managed {@code ConnectionProvider}.
 	 * <p>By default, {@code ConnectionProvider.elastic("http")} is used.
-	 * <p>Note that this option is ignored if {@code userGlobalResources=false} or
-	 * {@link #setConnectionProvider(ConnectionProvider)} is set.
+	 * <p>Note that this supplier is ignored if {@link #isUseGlobalResources()}
+	 * is {@code true} or once the {@link #setConnectionProvider(ConnectionProvider) ConnectionProvider}
+	 * is set.
 	 * @param supplier the supplier to use
 	 */
 	public void setConnectionProviderSupplier(Supplier<ConnectionProvider> supplier) {
@@ -136,8 +137,9 @@ public ConnectionProvider getConnectionProvider() {
 	 * Use this when you don't want to participate in global resources and
 	 * you want to customize the creation of the managed {@code LoopResources}.
 	 * <p>By default, {@code LoopResources.create("webflux-http")} is used.
-	 * <p>Note that this option is ignored if {@code userGlobalResources=false} or
-	 * {@link #setLoopResources(LoopResources)} is set.
+	 * <p>Note that this supplier is ignored if {@link #isUseGlobalResources()}
+	 * is {@code true} or once the {@link #setLoopResources(LoopResources) LoopResources}
+	 * is set.
 	 * @param supplier the supplier to use
 	 */
 	public void setLoopResourcesSupplier(Supplier<LoopResources> supplier) {