(rocketmq) branch develop updated: [ISSUE #10297] Set brokerName for messages returned by proxy local POP path (#10298)

[yuzhou]

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

yuz10 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 c5a4da5400 [ISSUE #10297] Set brokerName for messages returned by 
proxy local POP path (#10298)
c5a4da5400 is described below

commit c5a4da5400dca8051bedee5f17114d956b79ab33
Author: yx9o <yangx_s...@163.com>
AuthorDate: Wed May 13 14:42:57 2026 +0800

    [ISSUE #10297] Set brokerName for messages returned by proxy local POP path 
(#10298)
---
 .../org/apache/rocketmq/proxy/service/message/LocalMessageService.java  | 2 +-
 .../apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
index 189fde7fd7..c93fa93983 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
@@ -304,7 +304,7 @@ public class LocalMessageService implements MessageService {
                         }
                     }
                     
messageExt.getProperties().computeIfAbsent(MessageConst.PROPERTY_FIRST_POP_TIME,
 k -> String.valueOf(responseHeader.getPopTime()));
-                    messageExt.setBrokerName(messageExt.getBrokerName());
+                    messageExt.setBrokerName(messageQueue.getBrokerName());
                     messageExt.setTopic(messageQueue.getTopic());
                 }
             }
diff --git 
a/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java
 
b/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java
index 20ce2a1684..52ba521f80 100644
--- 
a/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java
+++ 
b/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java
@@ -336,6 +336,7 @@ public class LocalMessageServiceTest extends InitConfigTest 
{
         
assertThat(popResult.getMsgFoundList().size()).isEqualTo(messageExtList.size());
         for (int i = 0; i < popResult.getMsgFoundList().size(); i++) {
             assertMessageExt(popResult.getMsgFoundList().get(i), 
messageExtList.get(i));
+            
assertThat(popResult.getMsgFoundList().get(i).getBrokerName()).isEqualTo(brokerName);
         }
     }