[rocketmq] branch develop updated: [ISSUE #4658] remove redundant logic (#5245)

[aaronai]

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

aaronai pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5be473a69 [ISSUE #4658] remove redundant logic (#5245)
5be473a69 is described below

commit 5be473a690a2a1983c6941ca23b1a4f048e84be1
Author: zhiliatom <87265072+zhilia...@users.noreply.github.com>
AuthorDate: Sat Oct 8 14:25:49 2022 +0800

    [ISSUE #4658] remove redundant logic (#5245)
    
    * [ISSUE #4658] remove redundant logic
    
    * Update 
client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
    
    * Update 
client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
    
    Co-authored-by: lizhimins <707364...@qq.com>
    
    * Update 
client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
    
    Co-authored-by: Aaron Ai <yangkun....@gmail.com>
    Co-authored-by: lizhimins <707364...@qq.com>
---
 .../apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
index 89c549944..ab0d21d77 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
@@ -348,11 +348,9 @@ public class DefaultMQProducerImpl implements 
MQProducerInner {
                     try {
                         if (transactionCheckListener != null) {
                             localTransactionState = 
transactionCheckListener.checkLocalTransactionState(message);
-                        } else if (transactionListener != null) {
-                            log.debug("Used new check API in transaction 
message");
-                            localTransactionState = 
transactionListener.checkLocalTransaction(message);
                         } else {
-                            log.warn("CheckTransactionState, pick 
transactionListener by group[{}] failed", group);
+                            log.debug("TransactionCheckListener is null, used 
new check API, producerGroup={}", group);
+                            localTransactionState = 
transactionListener.checkLocalTransaction(message);
                         }
                     } catch (Throwable e) {
                         log.error("Broker call checkTransactionState, but 
checkLocalTransactionState exception", e);