You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by di...@apache.org on 2022/12/27 07:33:14 UTC

[rocketmq-connect] branch master updated: DebbeziumTimeType strong type turn bug (#378)

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

dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-connect.git


The following commit(s) were added to refs/heads/master by this push:
     new 3dc2f9a7 DebbeziumTimeType strong type turn bug (#378)
3dc2f9a7 is described below

commit 3dc2f9a7597a50f2ce8dd9379f903116e151b52e
Author: zhoubo <87...@qq.com>
AuthorDate: Tue Dec 27 15:33:10 2022 +0800

    DebbeziumTimeType strong type turn bug (#378)
---
 .../runtime/controller/isolation/DelegatingClassLoader.java    | 10 +++++++---
 .../connect/runtime/controller/isolation/PluginUtils.java      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/DelegatingClassLoader.java b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/DelegatingClassLoader.java
index 67e4d96a..cd4a95d1 100644
--- a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/DelegatingClassLoader.java
+++ b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/DelegatingClassLoader.java
@@ -23,6 +23,7 @@ import io.openmessaging.connector.api.component.task.sink.SinkTask;
 import io.openmessaging.connector.api.component.task.source.SourceConnector;
 import io.openmessaging.connector.api.component.task.source.SourceTask;
 import io.openmessaging.connector.api.data.RecordConverter;
+import org.apache.commons.lang3.StringUtils;
 import org.reflections.Configuration;
 import org.reflections.Reflections;
 import org.reflections.ReflectionsException;
@@ -143,9 +144,12 @@ public class DelegatingClassLoader extends URLClassLoader {
      * @return
      */
     public PluginClassLoader pluginClassLoader(String name) {
-//        if (!PluginUtils.shouldLoadInIsolation(name)) {
-//            return null;
-//        }
+        if (StringUtils.isEmpty(name) || StringUtils.isBlank(name)) {
+            return null;
+        }
+        if (!PluginUtils.shouldLoadInIsolation(name)) {
+            return null;
+        }
         SortedMap<PluginWrapper<?>, ClassLoader> inner = pluginLoaders.get(name);
         if (inner == null) {
             return null;
diff --git a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/PluginUtils.java b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/PluginUtils.java
index a8f11da4..454f354c 100644
--- a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/PluginUtils.java
+++ b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/controller/isolation/PluginUtils.java
@@ -119,7 +119,7 @@ public class PluginUtils {
             + "|org\\.xml\\.sax"
             + "|io\\.openmessaging\\.connector\\.api"
             + "|org\\.slf4j"
-            + "|org\\.apache\\.rocketmq"
+            + "|org\\.apache\\.rocketmq\\.client"
             + ")\\..*$"
             + "|io\\.openmessaging\\.KeyValue");