diff --git a/core/src/net/oschina/j2cache/J2CacheConfig.java b/core/src/net/oschina/j2cache/J2CacheConfig.java index 246a43430e798062e02e529269ec654cf4534a38..e3a8372933195b6267c0bead52858c2c5b9d53a0 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 d234945fd297c05d723fc3afd6ee18c0538c35c1..afc0a7e36ff274cce7fde381dcd71fb5b38a380c 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); } diff --git a/core/src/net/oschina/j2cache/util/SerializationUtils.java b/core/src/net/oschina/j2cache/util/SerializationUtils.java index b8d19a2d03d52dc9c696b0af8195ba1fc2079086..f53b7a4bbefb4f199dd11791dc519057e3886f8d 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)){