(rocketmq) branch develop updated: [ISSUE #8963] Fix code36 request sent to ns (#8964)

[yuzhou]

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

yuzhou 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 cd5071bd05 [ISSUE #8963] Fix code36 request sent to ns (#8964)
cd5071bd05 is described below

commit cd5071bd05acf4eae19affa5216638e28540cf0a
Author: yx9o <yangx_s...@163.com>
AuthorDate: Wed Nov 27 14:43:45 2024 +0800

    [ISSUE #8963] Fix code36 request sent to ns (#8964)
    
    * [ISSUE #8963] Fix code36 request sent to ns
    
    * Update DefaultMQPullConsumerImpl.java
---
 .../rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java      | 4 ++++
 .../rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java      | 3 +++
 2 files changed, 7 insertions(+)

diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
index e05c614c6d..371a4a0dbd 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
@@ -649,6 +649,10 @@ public class DefaultMQPullConsumerImpl implements 
MQConsumerInner {
             String brokerAddr = (null != destBrokerName) ? 
this.mQClientFactory.findBrokerAddressInPublish(destBrokerName)
                 : RemotingHelper.parseSocketAddressAddr(msg.getStoreHost());
 
+            if (UtilAll.isBlank(brokerAddr)) {
+                throw new MQClientException("Broker[" + destBrokerName + "] 
master node does not exist", null);
+            }
+
             if (UtilAll.isBlank(consumerGroup)) {
                 consumerGroup = this.defaultMQPullConsumer.getConsumerGroup();
             }
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
index 4eccba8e8d..46715cea95 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
@@ -767,6 +767,9 @@ public class DefaultMQPushConsumerImpl implements 
MQConsumerInner {
             } else {
                 String brokerAddr = (null != brokerName) ? 
this.mQClientFactory.findBrokerAddressInPublish(brokerName)
                     : 
RemotingHelper.parseSocketAddressAddr(msg.getStoreHost());
+                if (UtilAll.isBlank(brokerAddr)) {
+                    throw new MQClientException("Broker[" + brokerName + "] 
master node does not exist", null);
+                }
                 
this.mQClientFactory.getMQClientAPIImpl().consumerSendMessageBack(brokerAddr, 
brokerName, msg,
                     this.defaultMQPushConsumer.getConsumerGroup(), delayLevel, 
5000, getMaxReconsumeTimes());
             }