Skip to content

Return NORMAL for a null property map in TopicMessageType.parseFromMessageProperty #10553

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
vasiliy-mikhailov wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −0
Open

Return NORMAL for a null property map in TopicMessageType.parseFromMessageProperty #10553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public String getValue() {
}

public static TopicMessageType parseFromMessageProperty(Map<String, String> messageProperty) {
if (messageProperty == null) {
return TopicMessageType.NORMAL;
}
// the parse order keeps message types mutually exclusive
if (Boolean.parseBoolean(messageProperty.get(MessageConst.PROPERTY_TRANSACTION_PREPARED))) {
return TopicMessageType.TRANSACTION;
Expand Down
6 changes: 6 additions & 0 deletions common/src/test/java/org/apache/rocketmq/common/attribute/TopicMessageTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,10 @@ public void testParseFromMessageProperty() {
properties.clear();
Assert.assertEquals(TopicMessageType.NORMAL, TopicMessageType.parseFromMessageProperty(properties));
}

@Test
public void testParseFromMessageProperty_Null() {
// null map should be treated as empty - return NORMAL default
assertEquals(TopicMessageType.NORMAL, TopicMessageType.parseFromMessageProperty(null));
}
}