From ad6c7e634ebf8f3dbe2beaad2423eb4f280ee841 Mon Sep 17 00:00:00 2001
From: k <2674518127@qq.com>
Date: Tue, 4 Jun 2024 13:48:16 +0800
Subject: [PATCH 1/2] fix FSTSerializer

---
 core/src/net/oschina/j2cache/util/SerializationUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/net/oschina/j2cache/util/SerializationUtils.java b/core/src/net/oschina/j2cache/util/SerializationUtils.java
index b8d19a2..f53b7a4 100644
--- a/core/src/net/oschina/j2cache/util/SerializationUtils.java
+++ b/core/src/net/oschina/j2cache/util/SerializationUtils.java
@@ -47,7 +47,7 @@ public class SerializationUtils {
                 } else if("fury".equals(ser)){
                     g_serializer = Class.forName("net.oschina.j2cache.util.FurySerializer").asSubclass(Serializer.class).newInstance();
                 } else if ("fst".equals(ser)) {
-                    g_serializer = Class.forName("net.oschina.j2cache.util.FstSerializer").asSubclass(Serializer.class).newInstance();
+                    g_serializer = Class.forName("net.oschina.j2cache.util.FSTSerializer").asSubclass(Serializer.class).newInstance();
                 } else if ("kryo".equals(ser)) {
                     g_serializer = Class.forName("net.oschina.j2cache.util.KryoSerializer").asSubclass(Serializer.class).newInstance();
                 } else if ("kryo-pool".equals(ser)){
-- 
Gitee


From dc322362930a1e4daa205ffcf191e794819f0325 Mon Sep 17 00:00:00 2001
From: k <2674518127@qq.com>
Date: Tue, 4 Jun 2024 14:06:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20resource=E8=8E=B7=E5=8F=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/net/oschina/j2cache/J2CacheConfig.java             | 4 +++-
 core/src/net/oschina/j2cache/caffeine/CaffeineProvider.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/net/oschina/j2cache/J2CacheConfig.java b/core/src/net/oschina/j2cache/J2CacheConfig.java
index 246a434..e3a8372 100644
--- a/core/src/net/oschina/j2cache/J2CacheConfig.java
+++ b/core/src/net/oschina/j2cache/J2CacheConfig.java
@@ -139,7 +139,9 @@ public class J2CacheConfig {
             if(configStream == null){
                 configStream = J2Cache.class.getResourceAsStream(resource);
             }
-
+            if (configStream == null) {
+                configStream = J2Cache.class.getClassLoader().getResourceAsStream(resource);
+            }
             if (configStream == null) {
                 configStream = J2Cache.class.getClassLoader().getParent().getResourceAsStream(resource);
             }
diff --git a/core/src/net/oschina/j2cache/caffeine/CaffeineProvider.java b/core/src/net/oschina/j2cache/caffeine/CaffeineProvider.java
index d234945..afc0a7e 100644
--- a/core/src/net/oschina/j2cache/caffeine/CaffeineProvider.java
+++ b/core/src/net/oschina/j2cache/caffeine/CaffeineProvider.java
@@ -190,7 +190,9 @@ public class CaffeineProvider implements CacheProvider {
             if(configStream == null){
                 configStream = getClass().getResourceAsStream(propertiesFile);
             }
-
+            if (configStream == null) {
+                configStream = getClass().getClassLoader().getResourceAsStream(propertiesFile);
+            }
             if (configStream == null) {
                 configStream = getClass().getClassLoader().getParent().getResourceAsStream(propertiesFile);
             }
-- 
Gitee