[shardingsphere] branch master updated: Fix loading plugin error (#22690)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 0344685d64b Fix loading plugin error (#22690)
0344685d64b is described below

commit 0344685d64bcd91ad736846f66ac47ae6976c7ed
Author: jiangML <10...@qq.com>
AuthorDate: Tue Dec 6 13:33:10 2022 +0800

    Fix loading plugin error (#22690)
---
 .../org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java  | 2 +-
 .../org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
index ce324c02dde..4710c63ebb2 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
+++ b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
@@ -54,7 +54,6 @@ public final class ShardingSphereAgent {
         AgentConfiguration agentConfig = AgentConfigurationLoader.load();
         AgentConfigurationRegistry.INSTANCE.put(agentConfig);
         AgentPluginLoader pluginLoader = createPluginLoader();
-        pluginLoader.setEnhancedForProxy(isEnhancedForProxy());
         setUpAgentBuilder(instrumentation, pluginLoader);
         if (pluginLoader.isEnhancedForProxy()) {
             setupPluginBootService(agentConfig.getPlugins());
@@ -63,6 +62,7 @@ public final class ShardingSphereAgent {
     
     private static AgentPluginLoader createPluginLoader() throws IOException {
         AgentPluginLoader result = new AgentPluginLoader();
+        result.setEnhancedForProxy(isEnhancedForProxy());
         result.load();
         return result;
     }
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
index 48b122e0dc4..bec28bb5ba2 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
@@ -62,7 +62,7 @@ public final class AgentPluginLoader implements PluginLoader {
     /**
      * Load plugin jars and interceptor points.
      *
-     * @throws IOException IOException
+     * @throws IOException IO exception
      */
     public void load() throws IOException {
         loadPluginJars();