Skip to content

Commit

Permalink
bugfix: in dubbo 3.x version, the consumer can't generate tcc proxy(d…
Browse files Browse the repository at this point in the history
…evelop branch). (apache#6104)
  • Loading branch information
laywin authored Dec 18, 2023
1 parent 397c6e7 commit b550f11
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 2 additions & 0 deletions changes/en-us/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Add changes here for all PR submitted to the develop branch.
- [[#6025](https://github.com/seata/seata/pull/6025)] fix the white screen after click the "View Global Lock" button on the transaction info page in the console
- [[#6026](https://github.com/seata/seata/pull/6026)] fix incorrect metric report
- [[#4410](https://github.com/seata/seata/pull/4410)] support jdk9+ compile code
- [[#6104](https://github.com/seata/seata/pull/6104)] fix dubbo 3.x consumer can't generate TCC proxy in tcc mode.

### optimize:
- [[#6044](https://github.com/seata/seata/pull/6044)] optimize derivative product check base on mysql
Expand All @@ -29,6 +30,7 @@ Thanks to these contributors for their code commits. Please report an unintended
- [liuqiufeng](https://github.com/liuqiufeng)
- [ptyin](https://github.com/ptyin)
- [funky-eyes](https://github.com/funky-eyes)
- [laywin](https://github.com/laywin)


Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
2 changes: 2 additions & 0 deletions changes/zh-cn/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [[#6025](https://github.com/seata/seata/pull/6025)] 修复控制台点击事务信息页面中的"查看全局锁"按钮之后白屏的问题
- [[#6026](https://github.com/seata/seata/pull/6026)] 修复异常的打点
- [[#4410](https://github.com/seata/seata/pull/4410)] 修复jdk9+版本编译后,引入后ByteBuffer#flip NoSuchMethodError的问题
- [[#6104](https://github.com/seata/seata/pull/6104)] 修复在TCC模式下, dubbo 3.x版本消费者端不能生成TCC代理的问题

### optimize:
- [[#6044](https://github.com/seata/seata/pull/6044)] 优化MySQL衍生数据库判断逻辑
Expand All @@ -29,5 +30,6 @@
- [liuqiufeng](https://github.com/liuqiufeng)
- [ptyin](https://github.com/ptyin)
- [funky-eyes](https://github.com/funky-eyes)
- [laywin](https://github.com/laywin)

同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,15 @@ protected BranchStatus branchCommitSend(BranchCommitRequest request, GlobalSessi
BranchSession branchSession) throws IOException, TimeoutException {

BranchCommitResponse response = (BranchCommitResponse) remotingServer.sendSyncRequest(
branchSession.getResourceId(), branchSession.getClientId(), request, branchSession.isAT());
branchSession.getResourceId(), branchSession.getClientId(), request, isEnableTryOtherApp(branchSession.getBranchType()));
return response.getBranchStatus();
}

private boolean isEnableTryOtherApp(BranchType branchType) {
return branchType == BranchType.AT || branchType == BranchType.TCC;
}


@Override
public BranchStatus branchRollback(GlobalSession globalSession, BranchSession branchSession) throws TransactionException {
try {
Expand All @@ -199,7 +204,7 @@ protected BranchStatus branchRollbackSend(BranchRollbackRequest request, GlobalS
BranchSession branchSession) throws IOException, TimeoutException {

BranchRollbackResponse response = (BranchRollbackResponse) remotingServer.sendSyncRequest(
branchSession.getResourceId(), branchSession.getClientId(), request, branchSession.isAT());
branchSession.getResourceId(), branchSession.getClientId(), request, isEnableTryOtherApp(branchSession.getBranchType()));
return response.getBranchStatus();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
Expand Down Expand Up @@ -327,8 +326,7 @@ protected Object wrapIfNecessary(Object bean, String beanName, Object cacheKey)
}

private boolean doCheckers(Object bean, String beanName) {
if (PROXYED_SET.contains(beanName) || EXCLUDE_BEAN_NAME_SET.contains(beanName)
|| FactoryBean.class.isAssignableFrom(bean.getClass())) {
if (PROXYED_SET.contains(beanName) || EXCLUDE_BEAN_NAME_SET.contains(beanName)) {
return false;
}

Expand Down

0 comments on commit b550f11

Please sign in to comment.