修复重复订阅问题 alibaba#159

支持Java 11 alibaba#158
daviyang35 · Jan 7, 2022 · 309d38f · 309d38f
1 parent 13153f7
commit 309d38f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/...repeater-module/src/main/java/com/alibaba/jvm/sandbox/repeater/module/RepeaterModule.java b/...repeater-module/src/main/java/com/alibaba/jvm/sandbox/repeater/module/RepeaterModule.java
@@ -46,6 +46,7 @@
 
 import javax.annotation.Resource;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,6 +93,8 @@ public class RepeaterModule implements Module, ModuleLifecycle {
 
     private final AtomicBoolean initialized = new AtomicBoolean(false);
 
+    private static List<SubscribeSupporter> subscribes = new ArrayList<SubscribeSupporter>();
+
     @Override
     public void onLoad() throws Throwable {
         // 初始化日志框架
@@ -187,8 +190,9 @@ private synchronized void initialize(RepeaterConfig config) {
                 }
 
                 RepeaterBridge.instance().build(repeaters);
+                unregisterSubscribed();
                 // 装载消息订阅器
-                List<SubscribeSupporter> subscribes = lifecycleManager.loadSubscribes();
+                subscribes = lifecycleManager.loadSubscribes();
                 for (SubscribeSupporter subscribe : subscribes) {
                     subscribe.register();
                 }
@@ -200,6 +204,13 @@ private synchronized void initialize(RepeaterConfig config) {
         }
     }
 
+    private void unregisterSubscribed() {
+        for (SubscribeSupporter subscribe : subscribes) {
+            subscribe.unRegister();
+        }
+        subscribes.clear();
+    }
+
     /**
      * 回放http接口
      *

diff --git a/...plugin/src/main/java/com/alibaba/jvm/sandbox/repeater/plugin/java/JavaEntrancePlugin.java b/...plugin/src/main/java/com/alibaba/jvm/sandbox/repeater/plugin/java/JavaEntrancePlugin.java
@@ -68,10 +68,10 @@ public void onConfigChange(RepeaterConfig config) throws PluginLifeCycleExceptio
         if (configTemporary == null) {
             super.onConfigChange(config);
         } else {
-            this.config = config;
-            super.onConfigChange(config);
             List<Behavior> current = config.getJavaEntranceBehaviors();
             List<Behavior> latest = configTemporary.getJavaEntranceBehaviors();
+            this.config = config;
+            super.onConfigChange(config);
             if (JavaPluginUtils.hasDifference(current, latest)) {
                 reWatch0();
             }

diff --git a/repeater-console/repeater-console-bootstrap/pom.xml b/repeater-console/repeater-console-bootstrap/pom.xml
@@ -13,6 +13,14 @@
     <name>repeater-console::bootstrap</name>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.jvm.sandbox</groupId>
             <artifactId>repeater-console-service</artifactId>