[rocketmq] branch develop updated: [ISSUE #3196] Check if "requestHeader" is null before "requestHeader.getTopic()"

[jinrongtong]

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

jinrongtong 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 1b757b4  [ISSUE #3196] Check if "requestHeader" is null before 
"requestHeader.getTopic()"
1b757b4 is described below

commit 1b757b402262568cb2d8ac7d4073a2d8f7e7236c
Author: gorden5566 <gorden5...@126.com>
AuthorDate: Fri Jul 30 15:00:48 2021 +0800

    [ISSUE #3196] Check if "requestHeader" is null before 
"requestHeader.getTopic()"
---
 .../apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java  | 2 +-
 .../java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
index ced7c20..29ffc4b 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
@@ -257,8 +257,8 @@ public abstract class AbstractSendMessageProcessor extends 
AsyncNettyRequestProc
                 try {
                     final SendMessageRequestHeader requestHeader = 
parseRequestHeader(request);
 
-                    String namespace = 
NamespaceUtil.getNamespaceFromResource(requestHeader.getTopic());
                     if (null != requestHeader) {
+                        String namespace = 
NamespaceUtil.getNamespaceFromResource(requestHeader.getTopic());
                         context.setNamespace(namespace);
                         
context.setProducerGroup(requestHeader.getProducerGroup());
                         context.setTopic(requestHeader.getTopic());
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
index ccec506..8b3caa7 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
@@ -612,6 +612,7 @@ public class SendMessageProcessor extends 
AbstractSendMessageProcessor implement
         }
     }
 
+    @Override
     public SocketAddress getStoreHost() {
         return storeHost;
     }