zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix issue#3765

Browse Source
This commit is contained in:
Looly
2024-10-09 17:52:53 +08:00
parent 003ff34af1
commit e03cc1cb68
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java
View File

@@ -250,7 +250,7 @@ public class ReUtil {
* result : year: 2021, month: 10, day: 11 * result : year: 2021, month: 10, day: 11
* </pre> * </pre>
* *
* <p>jdk9+之后，因为此方法无效</p> * <p>jdk9+之后，此方法无效</p>
* *
* @param pattern 匹配的正则 * @param pattern 匹配的正则
* @param content 被匹配的内容 * @param content 被匹配的内容

10
hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
View File

@@ -217,8 +217,14 @@ public class HttpClient4Engine extends AbstractClientEngine {
// 连接池配置 // 连接池配置
if (config instanceof ApacheHttpClientConfig) { if (config instanceof ApacheHttpClientConfig) {
final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config;
manager.setMaxTotal(apacheHttpClientConfig.getMaxTotal()); final int maxTotal = apacheHttpClientConfig.getMaxTotal();
manager.setDefaultMaxPerRoute(apacheHttpClientConfig.getMaxPerRoute()); if(maxTotal > 0){
manager.setMaxTotal(maxTotal);
}
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if(maxPerRoute > 0){
manager.setDefaultMaxPerRoute(maxPerRoute);
}
} }
return manager; return manager;

2
hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
View File

@@ -226,10 +226,10 @@ public class HttpClient5Engine extends AbstractClientEngine {
if (config instanceof ApacheHttpClientConfig) { if (config instanceof ApacheHttpClientConfig) {
final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config;
final int maxTotal = apacheHttpClientConfig.getMaxTotal(); final int maxTotal = apacheHttpClientConfig.getMaxTotal();
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if (maxTotal > 0) { if (maxTotal > 0) {
connectionManagerBuilder.setMaxConnTotal(maxTotal); connectionManagerBuilder.setMaxConnTotal(maxTotal);
} }
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if (maxPerRoute > 0) { if (maxPerRoute > 0) {
connectionManagerBuilder.setMaxConnPerRoute(maxPerRoute); connectionManagerBuilder.setMaxConnPerRoute(maxPerRoute);
} }