From 3eef8aa6ec7dfbbd7d5898adf02efd63ed74962a Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 8 Nov 2022 16:16:49 +0800 Subject: [PATCH] add spi --- .../cn/hutool/core/net/ssl/DefaultTrustManager.java | 2 +- .../java/cn/hutool/cron/timingwheel/TimingWheel.java | 10 +++++----- .../services/cn.hutool.http.client.ClientEngine | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100755 hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/DefaultTrustManager.java b/hutool-core/src/main/java/cn/hutool/core/net/ssl/DefaultTrustManager.java index 0c686a02c..1f0903fdb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/DefaultTrustManager.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/ssl/DefaultTrustManager.java @@ -22,7 +22,7 @@ public class DefaultTrustManager extends X509ExtendedTrustManager { @Override public X509Certificate[] getAcceptedIssuers() { - return null; + return new X509Certificate[0]; } @Override diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java b/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java index 66042249b..80ee78ce6 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java @@ -72,6 +72,10 @@ public class TimingWheel { this.wheelSize = wheelSize; this.interval = tickMs * wheelSize; this.timerTaskLists = new TimerTaskList[wheelSize]; + for (int i = 0; i < wheelSize; i++) { + this.timerTaskLists[i] = new TimerTaskList(); + } + //currentTime为tickMs的整数倍 这里做取整操作 this.currentTime = currentTime - (currentTime % tickMs); this.consumer = consumer; @@ -94,11 +98,7 @@ public class TimingWheel { final int index = (int) (virtualId % wheelSize); StaticLog.debug("tickMs: {} ------index: {} ------expiration: {}", tickMs, index, expiration); - TimerTaskList timerTaskList = timerTaskLists[index]; - if (null == timerTaskList) { - timerTaskList = new TimerTaskList(); - timerTaskLists[index] = timerTaskList; - } + final TimerTaskList timerTaskList = timerTaskLists[index]; timerTaskList.addTask(timerTask); if (timerTaskList.setExpiration(virtualId * tickMs)) { //添加到delayQueue中 diff --git a/hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine b/hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine new file mode 100755 index 000000000..f30c4333e --- /dev/null +++ b/hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine @@ -0,0 +1,4 @@ +cn.hutool.http.client.engine.httpclient5.HttpClient5Engine +cn.hutool.http.client.engine.httpclient4.HttpClient4Engine +cn.hutool.http.client.engine.okhttp.OkHttpEngine +cn.hutool.http.client.engine.jdk.JdkClientEngine