This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 93d7e80a97 [ISSUE #8950] Remove Redundant nullcheck of configPath
(#8951)
93d7e80a97 is described below
commit 93d7e80a972ec07f2fa853355449aba8060eae12
Author: jiao jianan <[email protected]>
AuthorDate: Mon Dec 2 10:03:16 2024 +0800
[ISSUE #8950] Remove Redundant nullcheck of configPath (#8951)
Co-authored-by: jiaoja <[email protected]>
---
.../org/apache/rocketmq/container/BrokerContainerProcessor.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerProcessor.java
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerProcessor.java
index 5ced082576..80dd6ccb13 100644
---
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerProcessor.java
+++
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerProcessor.java
@@ -86,7 +86,7 @@ public class BrokerContainerProcessor implements
NettyRequestProcessor {
}
private synchronized RemotingCommand addBroker(ChannelHandlerContext ctx,
- RemotingCommand request) throws Exception {
+ RemotingCommand request)
throws Exception {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final AddBrokerRequestHeader requestHeader = (AddBrokerRequestHeader)
request.decodeCommandCustomHeader(AddBrokerRequestHeader.class);
@@ -124,10 +124,7 @@ public class BrokerContainerProcessor implements
NettyRequestProcessor {
MixAll.properties2Object(brokerProperties, messageStoreConfig);
messageStoreConfig.setHaListenPort(brokerConfig.getListenPort() + 1);
-
- if (configPath != null && !configPath.isEmpty()) {
- brokerConfig.setBrokerConfigPath(configPath);
- }
+ brokerConfig.setBrokerConfigPath(configPath);
if (!messageStoreConfig.isEnableDLegerCommitLog()) {
if (!brokerConfig.isEnableControllerMode()) {