From 3a532617a1de873a747af749ca0eee0e686bbebe Mon Sep 17 00:00:00 2001 From: redkale Date: Sat, 12 Oct 2024 08:33:14 +0800 Subject: [PATCH] createCacheClassLoader --- src/main/java/org/redkale/boot/AppConfig.java | 9 ++------- src/main/java/org/redkale/util/RedkaleClassLoader.java | 6 +++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/redkale/boot/AppConfig.java b/src/main/java/org/redkale/boot/AppConfig.java index 86f84df97..36742c693 100644 --- a/src/main/java/org/redkale/boot/AppConfig.java +++ b/src/main/java/org/redkale/boot/AppConfig.java @@ -143,16 +143,11 @@ class AppConfig { if (cacheClasses == null) { this.classLoader = new RedkaleClassLoader(currClassLoader); } else { - this.classLoader = new RedkaleClassLoader.RedkaleCacheClassLoader(currClassLoader, cacheClasses); + this.classLoader = new RedkaleClassLoader.createCacheClassLoader(currClassLoader, cacheClasses); } Thread.currentThread().setContextClassLoader(this.classLoader); } - if (compileMode || this.classLoader instanceof RedkaleClassLoader.RedkaleCacheClassLoader) { - this.serverClassLoader = this.classLoader; - } else { - // this.serverClassLoader = RedkaleClassLoader.currentClassLoader(this.classLoader); - this.serverClassLoader = this.classLoader; - } + this.serverClassLoader = this.classLoader; } /** 初始化home、confDir、localAddress等信息 */ diff --git a/src/main/java/org/redkale/util/RedkaleClassLoader.java b/src/main/java/org/redkale/util/RedkaleClassLoader.java index a0c0c4fac..f4d614e61 100644 --- a/src/main/java/org/redkale/util/RedkaleClassLoader.java +++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java @@ -107,6 +107,10 @@ public class RedkaleClassLoader extends URLClassLoader { return new RedkaleClassLoader(loader); } + public static RedkaleClassLoader createCacheClassLoader(ClassLoader parent, Set classes) { + return new RedkaleCacheClassLoader(parent, classes); + } + public static URI getConfResourceAsURI(String confURI, String file) { if (file.startsWith("http:") || file.startsWith("https:") || file.startsWith("ftp:")) { return URI.create(file); @@ -623,7 +627,7 @@ public class RedkaleClassLoader extends URLClassLoader { return set.toArray(new URI[set.size()]); } - public static class RedkaleCacheClassLoader extends RedkaleClassLoader { + protected static class RedkaleCacheClassLoader extends RedkaleClassLoader { protected final Set classes;