From dc048e72c3b92884528e502f52dd92c18e9dfad1 Mon Sep 17 00:00:00 2001 From: xiezheng-XD <141627292+xiezheng-XD@users.noreply.github.com> Date: Wed, 30 Aug 2023 22:57:14 +0800 Subject: [PATCH 1/3] Update JetCacheExecutor.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 做了以下两点改动： 1.使用了AtomicInteger以确保threadCount的线程安全性 2.在创建新的线程时使用了getAndIncrement()方法来递增计数 --- .../java/com/alicp/jetcache/support/JetCacheExecutor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jetcache-core/src/main/java/com/alicp/jetcache/support/JetCacheExecutor.java b/jetcache-core/src/main/java/com/alicp/jetcache/support/JetCacheExecutor.java index 692bf3340..1187ba84f 100644 --- a/jetcache-core/src/main/java/com/alicp/jetcache/support/JetCacheExecutor.java +++ b/jetcache-core/src/main/java/com/alicp/jetcache/support/JetCacheExecutor.java @@ -4,6 +4,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicInteger; /** * Created on 2017/5/3. @@ -14,7 +15,7 @@ public class JetCacheExecutor { protected volatile static ScheduledExecutorService defaultExecutor; protected volatile static ScheduledExecutorService heavyIOExecutor; - private static int threadCount; + private static AtomicInteger threadCount = new AtomicInteger(0); static { Runtime.getRuntime().addShutdownHook(new Thread() { @@ -55,7 +56,7 @@ public static ScheduledExecutorService heavyIOExecutor() { synchronized (JetCacheExecutor.class) { if (heavyIOExecutor == null) { ThreadFactory tf = r -> { - Thread t = new Thread(r, "JetCacheHeavyIOExecutor" + threadCount++); + Thread t = new Thread(r, "JetCacheHeavyIOExecutor" + threadCount.getAndIncrement()); t.setDaemon(true); return t; }; From ce343b276aff38ef57954c7433513dc3eb95e3c6 Mon Sep 17 00:00:00 2001 From: xiezheng-XD <141627292+xiezheng-XD@users.noreply.github.com> Date: Wed, 30 Aug 2023 23:16:34 +0800 Subject: [PATCH 2/3] Update AbstractExternalCacheTest.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改assertNull()使用错误 --- .../alicp/jetcache/test/external/AbstractExternalCacheTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java b/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java index b3e827442..40fedc3ee 100644 --- a/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java +++ b/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java @@ -38,7 +38,7 @@ protected void nullKeyConvertorTest() { d2.setName("HL2"); cache.put(d1, "V2"); - Assert.assertNull("V2", cache.get(d2)); + Assert.assertEquals("V2", cache.get(d2)); Assert.assertNull(cache.get(d3)); } } From 3d57f07646291ce852e99bb0800def7811e4c97d Mon Sep 17 00:00:00 2001 From: xiezheng-XD <141627292+xiezheng-XD@users.noreply.github.com> Date: Thu, 31 Aug 2023 10:15:31 +0800 Subject: [PATCH 3/3] Update AbstractExternalCacheTest.java --- .../alicp/jetcache/test/external/AbstractExternalCacheTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java b/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java index 40fedc3ee..05ede3b3a 100644 --- a/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java +++ b/jetcache-test/src/main/java/com/alicp/jetcache/test/external/AbstractExternalCacheTest.java @@ -38,7 +38,7 @@ protected void nullKeyConvertorTest() { d2.setName("HL2"); cache.put(d1, "V2"); - Assert.assertEquals("V2", cache.get(d2)); + Assert.assertNull(cache.get(d2)); Assert.assertNull(cache.get(d3)); } }