From e03cc1cb68ae4270678c7ab18a9453506cf9a26d Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 9 Oct 2024 17:52:53 +0800 Subject: [PATCH] fix issue#3765 --- .../java/org/dromara/hutool/core/regex/ReUtil.java | 2 +- .../client/engine/httpclient4/HttpClient4Engine.java | 10 ++++++++-- .../client/engine/httpclient5/HttpClient5Engine.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java index 244dc7948..f68d7e891 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java @@ -250,7 +250,7 @@ public class ReUtil { * result : year: 2021, month: 10, day: 11 * * - *

jdk9+之后，因为此方法无效

+ *

jdk9+之后，此方法无效

* * @param pattern 匹配的正则 * @param content 被匹配的内容 diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java index ec16465c8..eb86f796a 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java @@ -217,8 +217,14 @@ public class HttpClient4Engine extends AbstractClientEngine { // 连接池配置 if (config instanceof ApacheHttpClientConfig) { final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; - manager.setMaxTotal(apacheHttpClientConfig.getMaxTotal()); - manager.setDefaultMaxPerRoute(apacheHttpClientConfig.getMaxPerRoute()); + final int maxTotal = apacheHttpClientConfig.getMaxTotal(); + if(maxTotal > 0){ + manager.setMaxTotal(maxTotal); + } + final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute(); + if(maxPerRoute > 0){ + manager.setDefaultMaxPerRoute(maxPerRoute); + } } return manager; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java index 544cdcc99..e91ca3512 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java @@ -226,10 +226,10 @@ public class HttpClient5Engine extends AbstractClientEngine { if (config instanceof ApacheHttpClientConfig) { final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; final int maxTotal = apacheHttpClientConfig.getMaxTotal(); - final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute(); if (maxTotal > 0) { connectionManagerBuilder.setMaxConnTotal(maxTotal); } + final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute(); if (maxPerRoute > 0) { connectionManagerBuilder.setMaxConnPerRoute(maxPerRoute); }