Merge branch 'master' into feat_serviceManager

Author: xchoox

shenyu-integrated-test/shenyu-integrated-test-motan/src/test/java/org/apache/shenyu/integrated/test/motan/MotanPluginTest.java

@@ -36,7 +36,7 @@ public class MotanPluginTest extends AbstractPluginDataInit {
 
     @BeforeAll
     public static void setup() throws IOException {
-        String pluginResult = initPlugin(PluginEnum.MOTAN.getName(), "{\"registerAddress\":shenyu-zk:2181\"\",\"registerProtocol\":\"zk\"}");
+        String pluginResult = initPlugin(PluginEnum.MOTAN.getName(), "{\"registerAddress\":\"shenyu-zk:2181\",\"registerProtocol\":\"zk\"}");
         assertThat(pluginResult, is("success"));
     }
 

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/CommonPluginDataSubscriber.java

@@ -27,6 +27,7 @@
 import org.apache.shenyu.common.enums.PluginHandlerEventEnum;
 import org.apache.shenyu.common.enums.TrieCacheTypeEnum;
 import org.apache.shenyu.common.enums.TrieEventEnum;
+import org.apache.shenyu.common.utils.JsonUtils;
 import org.apache.shenyu.common.utils.MapUtils;
 import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
 import org.apache.shenyu.plugin.base.event.TrieEvent;
@@ -195,12 +196,16 @@ public void refreshRuleDataSelf(final List<RuleData> ruleDataList) {
     }
 
     private <T> void subscribeDataHandler(final T classData, final DataEventTypeEnum dataType) {
-        if (dataType == DataEventTypeEnum.UPDATE) {
-            Optional.ofNullable(classData)
-                    .ifPresent(data -> updateCacheData(classData));
-        } else if (dataType == DataEventTypeEnum.DELETE) {
-            Optional.ofNullable(classData)
-                    .ifPresent(data -> removeCacheData(classData));
+        try {
+            if (dataType == DataEventTypeEnum.UPDATE) {
+                Optional.ofNullable(classData)
+                        .ifPresent(data -> updateCacheData(classData));
+            } else if (dataType == DataEventTypeEnum.DELETE) {
+                Optional.ofNullable(classData)
+                        .ifPresent(data -> removeCacheData(classData));
+            }
+        } catch (Exception e) {
+            LOG.error("subscribe data handler error, classData: {}, dataType: {}", JsonUtils.toJson(classData), dataType, e);
         }
     }