Skip to content

Commit dbd2791

Browse files
authored
[ISSUE #8889] handle namespace outside the loop (#8890)
* handle namespace outside the loop * fix checkstyle check failed
1 parent 8514734 commit dbd2791

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1084,12 +1084,12 @@ private void resetTopic(List<MessageExt> msgList) {
10841084
}
10851085

10861086
//If namespace not null , reset Topic without namespace.
1087-
for (MessageExt messageExt : msgList) {
1088-
if (null != this.defaultLitePullConsumer.getNamespace()) {
1089-
messageExt.setTopic(NamespaceUtil.withoutNamespace(messageExt.getTopic(), this.defaultLitePullConsumer.getNamespace()));
1087+
String namespace = this.defaultLitePullConsumer.getNamespace();
1088+
if (namespace != null) {
1089+
for (MessageExt messageExt : msgList) {
1090+
messageExt.setTopic(NamespaceUtil.withoutNamespace(messageExt.getTopic(), namespace));
10901091
}
10911092
}
1092-
10931093
}
10941094

10951095
public void updateConsumeOffset(MessageQueue mq, long offset) {

client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,12 @@ public void resetTopic(List<MessageExt> msgList) {
290290
}
291291

292292
//If namespace not null , reset Topic without namespace.
293-
for (MessageExt messageExt : msgList) {
294-
if (null != this.getDefaultMQPullConsumer().getNamespace()) {
295-
messageExt.setTopic(NamespaceUtil.withoutNamespace(messageExt.getTopic(), this.defaultMQPullConsumer.getNamespace()));
293+
String namespace = this.getDefaultMQPullConsumer().getNamespace();
294+
if (namespace != null) {
295+
for (MessageExt messageExt : msgList) {
296+
messageExt.setTopic(NamespaceUtil.withoutNamespace(messageExt.getTopic(), namespace));
296297
}
297298
}
298-
299299
}
300300

301301
public void subscriptionAutomatically(final String topic) {

0 commit comments

Comments
 (0)