Skip to content

[ISSUE #10008] Fix NullPointerException in AdminBrokerProcessor.updateAndCreateTopicList at line 636 (#10008) #10075

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
Sorieee wants to merge 1 commit into
base: develop
Choose a base branch
from
+17 −2
Open

[ISSUE #10008] Fix NullPointerException in AdminBrokerProcessor.updateAndCreateTopicList at line 636 (#10008) #10075

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
9 changes: 7 additions & 2 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,13 @@ private synchronized RemotingCommand updateAndCreateTopicList(ChannelHandlerCont
RemotingCommand request) throws RemotingCommandException {
long startTime = System.currentTimeMillis();


final RemotingCommand response = RemotingCommand.createResponseCommand(null);
if (request.getBody() == null) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("requestBody must not be null");
return response;
}
final CreateTopicListRequestBody requestBody = CreateTopicListRequestBody.decode(request.getBody(), CreateTopicListRequestBody.class);
List<TopicConfig> topicConfigList = requestBody.getTopicConfigList();

Expand All @@ -643,8 +650,6 @@ private synchronized RemotingCommand updateAndCreateTopicList(ChannelHandlerCont
String topicNames = builder.toString();
LOGGER.info("AdminBrokerProcessor#updateAndCreateTopicList: topicNames: {}, called by {}", topicNames, RemotingHelper.parseChannelRemoteAddr(ctx.channel()));

final RemotingCommand response = RemotingCommand.createResponseCommand(null);

long executionTime;

try {
Expand Down
10 changes: 10 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,16 @@ public void testProcessRequest_success() throws RemotingCommandException, Unknow
assertThat(response.getCode()).isEqualTo(ResponseCode.SUCCESS);
}

@Test
public void testProcessRequestBodyNull() throws Throwable {
BrokerConfig brokerConfig = new BrokerConfig();
ResumeCheckHalfMessageRequestHeader header = createResumeCheckHalfMessageRequestHeader();
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.UPDATE_AND_CREATE_TOPIC_LIST, header);
request.makeCustomHeaderToNet();
RemotingCommand response = adminBrokerProcessor.processRequest(handlerContext, request);
assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_ERROR);
}

@Test
public void testProcessRequest_fail() throws RemotingCommandException, UnknownHostException {
RemotingCommand request = createResumeCheckHalfMessageCommand();
Expand Down
Loading