opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-10-29 17:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #4377]Unnecessary null check before method call (#4378)

Browse Source 
* Update .travis.yml

Depracated MODERATE noisy mail for dev@rocketmq.apache.org. Still Failing: apache/rocketmq#5670 (5.0.0-alpha-static-topic - 5ebc327) @dongeforever

* Updated Notice file to 2022 (#3735)

* Unnecessary_null_check_before_method_call

Co-authored-by: von gosling <vongosling@apache.org>
Co-authored-by: ZhangJian He <shoothzj@gmail.com>
Co-authored-by: tigerweili <tigerweili@tencent.com>
This commit is contained in:
CoderBruis
2022-06-06 11:18:11 +08:00
committed by GitHub
co-authored by von gosling ZhangJian He tigerweili
parent 14042fa96a
commit 7973f9ee5e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
+2 -2
View File
@@ -314,7 +314,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement
CompletableFuture<PutMessageResult> putMessageResult = null;
String transFlag = origProps.get(MessageConst.PROPERTY_TRANSACTION_PREPARED);
if (transFlag != null && Boolean.parseBoolean(transFlag)) {
if (Boolean.parseBoolean(transFlag)) {
if (this.brokerController.getBrokerConfig().isRejectTransactionMessage()) {
response.setCode(ResponseCode.NO_PERMISSION);
response.setRemark(
@@ -445,7 +445,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement
PutMessageResult putMessageResult = null;
Map<String, String> oriProps = MessageDecoder.string2messageProperties(requestHeader.getProperties());
String traFlag = oriProps.get(MessageConst.PROPERTY_TRANSACTION_PREPARED);
if (traFlag != null && Boolean.parseBoolean(traFlag)
if (Boolean.parseBoolean(traFlag)
&& !(msgInner.getReconsumeTimes() > 0 && msgInner.getDelayTimeLevel() > 0)) { //For client under version 4.6.1
if (this.brokerController.getBrokerConfig().isRejectTransactionMessage()) {
response.setCode(ResponseCode.NO_PERMISSION);