Skip to content

Commit fef690c

Browse files
authored
[ISSUE #9943] Remove redundant containsKey check in checkBrokerConfig (#9944)
1 parent 684e733 commit fef690c

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

client/src/main/java/org/apache/rocketmq/client/Validators.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@ public static void checkTopicConfig(final TopicConfig topicConfig) throws MQClie
131131
}
132132

133133
public static void checkBrokerConfig(final Properties brokerConfig) throws MQClientException {
134-
// TODO: use MixAll.isPropertyValid() when jdk upgrade to 1.8
135-
if (brokerConfig.containsKey("brokerPermission")
136-
&& !PermName.isValid(brokerConfig.getProperty("brokerPermission"))) {
134+
String brokerPermission = brokerConfig.getProperty("brokerPermission");
135+
if (brokerPermission != null && !PermName.isValid(brokerPermission)) {
137136
throw new MQClientException(ResponseCode.NO_PERMISSION,
138-
String.format("brokerPermission value: %s is invalid.", brokerConfig.getProperty("brokerPermission")));
137+
String.format("brokerPermission value: %s is invalid.", brokerPermission));
139138
}
140139
}
141140
}

0 commit comments

Comments
 (0)