Merge pull request #1465 from lilai23/classloader

set PluginClassLoader for plugin config
sermant-io · Mar 26, 2024 · 48ab598 · 48ab598
2 parents bafe18c + 970fd59
commit 48ab598
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...core/src/main/java/com/huaweicloud/sermant/core/plugin/classloader/PluginClassLoader.java b/...core/src/main/java/com/huaweicloud/sermant/core/plugin/classloader/PluginClassLoader.java
@@ -118,7 +118,7 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
                 }
 
                 // 确保局部类加载器不是当前类加载器，否则会stackoverflow
-                if (loader != null && !this.equals(loader)) {
+                if (loader != null && !this.equals(loader) && !(loader instanceof ServiceClassLoader)) {
                     try {
                         clazz = loader.loadClass(name);
                     } catch (ClassNotFoundException e) {

diff --git a/...re-core/src/main/java/com/huaweicloud/sermant/core/plugin/config/PluginConfigManager.java b/...re-core/src/main/java/com/huaweicloud/sermant/core/plugin/config/PluginConfigManager.java
@@ -60,8 +60,7 @@ private PluginConfigManager() {
      */
     public static void loadPluginConfigs(Plugin plugin) {
         File pluginConfigFile = getPluginConfigFile(plugin.getPath());
-        ClassLoader classLoader =
-                plugin.getServiceClassLoader() != null ? plugin.getServiceClassLoader() : plugin.getPluginClassLoader();
+        ClassLoader classLoader = plugin.getPluginClassLoader();
         for (BaseConfig config : ServiceLoader.load(PluginConfig.class, classLoader)) {
             Class<? extends BaseConfig> pluginConfigCls = config.getClass();
             String pluginConfigKey = ConfigKeyUtil.getCLTypeKey(ConfigKeyUtil.getTypeKey(pluginConfigCls),