Merge branch 'develop' into feature/metrics_gzip_batch_split

Houlong66 · Houlong66 · commit 78bdf822bf88 · 2026-04-02T18:17:14.000+08:00
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
@@ -140,7 +140,7 @@ public void unlockAll(final boolean oneway) {
             Set<MessageQueue> mqs = result.get(destBrokerName);
             if (null == mqs) {
                 mqs = new HashSet<>();
-                result.put(mq.getBrokerName(), mqs);
+                result.put(destBrokerName, mqs);
             }
 
             mqs.add(mq);

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void unlockAll(final boolean oneway) {`
`140`	`140`	`Set<MessageQueue> mqs = result.get(destBrokerName);`
`141`	`141`	`if (null == mqs) {`
`142`	`142`	`mqs = new HashSet<>();`
`143`		`- result.put(mq.getBrokerName(), mqs);`
	`143`	`+ result.put(destBrokerName, mqs);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`mqs.add(mq);`