Skip to content

fix: fix null point and some typo errors #10571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
enkilee wants to merge 2 commits into
base: develop
Choose a base branch
from
+15 −9
Open

fix: fix null point and some typo errors #10571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bcfc6d
Signed-off-by: enkilee <jeffrey0122@163.com>
enkilee Jul 2, 2026
d12c157
Signed-off-by: enkilee <jeffrey0122@163.com>
enkilee Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions broker/src/main/java/org/apache/rocketmq/broker/filter/ExpressionForRetryMessageFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ public boolean isMatchedByCommitLog(ByteBuffer msgBuffer, Map<String, String> pr
decoded = true;
tempProperties = MessageDecoder.decodeProperties(msgBuffer);
}
if (tempProperties == null) {
return false;
}
String realTopic = tempProperties.get(MessageConst.PROPERTY_RETRY_TOPIC);
String group = KeyBuilder.parseGroup(subscriptionData.getTopic());
realFilterData = this.consumerFilterManager.get(realTopic, group);
Expand Down
19 changes: 11 additions & 8 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,18 @@ private CompletableFuture<Boolean> appendCheckPointThenAckOrigin(
this.brokerController.getBrokerStatsManager().incBrokerCkNums(1);
this.brokerController.getBrokerStatsManager().incGroupCkNums(requestHeader.getConsumerGroup(), requestHeader.getTopic(), 1);
}
}
if (putMessageResult.getPutMessageStatus() != PutMessageStatus.PUT_OK
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.FLUSH_DISK_TIMEOUT
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.FLUSH_SLAVE_TIMEOUT
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.SLAVE_NOT_AVAILABLE) {
POP_LOGGER.error("change invisible, put new ck error: {}", putMessageResult);
return CompletableFuture.completedFuture(false);
if (putMessageResult.getPutMessageStatus() != PutMessageStatus.PUT_OK
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.FLUSH_DISK_TIMEOUT
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.FLUSH_SLAVE_TIMEOUT
&& putMessageResult.getPutMessageStatus() != PutMessageStatus.SLAVE_NOT_AVAILABLE) {
POP_LOGGER.error("change invisible, put new ck error: {}", putMessageResult);
return CompletableFuture.completedFuture(false);
} else {
return ackOrigin(requestHeader, extraInfo);
}
} else {
return ackOrigin(requestHeader, extraInfo);
POP_LOGGER.error("change invisible, put new ck error: putMessageResult is null");
return CompletableFuture.completedFuture(false);
}
}).exceptionally(throwable -> {
POP_LOGGER.error("change invisible, put new ck error", throwable);
Expand Down
2 changes: 1 addition & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/topic/TopicQueueMappingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void updateTopicQueueMapping(TopicQueueMappingDetail newDetail, boolean f
return;
}
if (force) {
//bakeup the old items
//backup the old items
oldDetail.getHostedQueues().forEach((queueId, items) -> {
newDetail.getHostedQueues().putIfAbsent(queueId, items);
});
Expand Down