bugfix: in dubbo 3.x version, the consumer can't generate tcc proxy. (#…

…6101)
apache · Dec 18, 2023 · 2f9957b · 2f9957b
1 parent 501d431
commit 2f9957b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -10,6 +10,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6075](https://github.com/seata/seata/pull/6075)] fix missing table alias for on update column of image SQL
 - [[#6086](https://github.com/seata/seata/pull/6086)] fix oracle column alias cannot find
 - [[#6085](https://github.com/seata/seata/pull/6085)] fix jdk9+ compile error
+- [[#6101](https://github.com/seata/seata/pull/6101)] fix the consumer can't generate tcc proxy in dubbo 3.x version
 - [[#6077](https://github.com/seata/seata/pull/6077)] fix could not rollback when table with multiple primary
 - [[#6121](https://github.com/seata/seata/pull/6121)] fix the branch transaction order error when rolling back
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -10,6 +10,7 @@
 - [[#6075](https://github.com/seata/seata/pull/6075)] 修复镜像SQL对于on update列没有添加表别名的问题
 - [[#6086](https://github.com/seata/seata/pull/6086)] 修复oracle alias 解析异常
 - [[#6085](https://github.com/seata/seata/pull/6085)] 修复jdk9+版本编译后，引入后ByteBuffer#flip NoSuchMethodError的问题
+- [[#6101](https://github.com/seata/seata/pull/6101)] 修复在dubbo 3.x的版本中, 消费者端不能生成tcc代理的问题
 - [[#6077](https://github.com/seata/seata/pull/6077)] 修复表存在复合主键索引导致无法回滚问题
 - [[#6121](https://github.com/seata/seata/pull/6121)] 修复回滚分支事务时没有按照时间排序的问题
 

diff --git a/core/src/main/java/io/seata/core/rpc/RemotingServer.java b/core/src/main/java/io/seata/core/rpc/RemotingServer.java
@@ -37,7 +37,7 @@ public interface RemotingServer {
      * @param resourceId rm client resourceId
      * @param clientId   rm client id
      * @param msg        transaction message {@code io.seata.core.protocol}
-     * @param tryOtherApp   try other app
+     * @param tryOtherApp try other app
      * @return client result message
      * @throws TimeoutException TimeoutException
      */

diff --git a/core/src/main/java/io/seata/core/rpc/netty/ChannelManager.java b/core/src/main/java/io/seata/core/rpc/netty/ChannelManager.java
@@ -285,6 +285,7 @@ private static Channel getChannelFromSameClientMap(Map<Integer, RpcContext> clie
      *
      * @param resourceId Resource ID
      * @param clientId   Client ID - ApplicationId:IP:Port
+     * @param tryOtherApp try other app
      * @return Corresponding channel, NULL if not found.
      */
     public static Channel getChannel(String resourceId, String clientId, boolean tryOtherApp) {

diff --git a/integration-tx-api/src/main/java/io/seata/integration/tx/api/util/DubboUtil.java b/integration-tx-api/src/main/java/io/seata/integration/tx/api/util/DubboUtil.java
@@ -34,6 +34,8 @@ private DubboUtil() {
     private static final String ALIBABA_DUBBO_PROXY_NAME_PREFIX = "com.alibaba.dubbo.common.bytecode.proxy";
     private static final String APACHE_DUBBO_PROXY_NAME_PREFIX = "org.apache.dubbo.common.bytecode.proxy";
 
+    private static final String DUBBO_3_X_PARTIAL_PROXY_NAME = "DubboProxy";
+
     /**
      * get the interface class of the dubbo proxy which be  generated by javaassist
      *
@@ -69,6 +71,6 @@ public static Class<?> getAssistInterface(Object proxyBean)
     }
 
     public static boolean isDubboProxyName(String name) {
-        return name.startsWith(ALIBABA_DUBBO_PROXY_NAME_PREFIX) || name.startsWith(APACHE_DUBBO_PROXY_NAME_PREFIX);
+        return name.startsWith(ALIBABA_DUBBO_PROXY_NAME_PREFIX) || name.startsWith(APACHE_DUBBO_PROXY_NAME_PREFIX) || name.contains(DUBBO_3_X_PARTIAL_PROXY_NAME);
     }
 }