From a5395aa2f1af2c360325212676f20ff8626edb41 Mon Sep 17 00:00:00 2001 From: "minghua.xie" Date: Tue, 3 Dec 2024 15:50:51 +0800 Subject: [PATCH] end if msg null --- .../apache/seata/integration/rocketmq/TCCRocketMQImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java index 2eb68a08e89..8d84b335082 100644 --- a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java +++ b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java @@ -75,7 +75,7 @@ public boolean commit(BusinessActionContext context) Message message = context.getActionContext(ROCKET_MSG_KEY, Message.class); SendResult sendResult = context.getActionContext(ROCKET_SEND_RESULT_KEY, SendResult.class); if (checkMqStatus(message, sendResult)) { - throw new TransactionException("TCCRocketMQ commit but cannot find message and sendResult"); + throw new TransactionException("TCCRocketMQ commit but cannot find message or sendResult"); } this.producerImpl.endTransaction(message, sendResult, LocalTransactionState.COMMIT_MESSAGE, null); LOGGER.info("RocketMQ message send commit, xid = {}, branchId = {}", context.getXid(), context.getBranchId()); @@ -88,7 +88,7 @@ public boolean rollback(BusinessActionContext context) Message message = context.getActionContext(ROCKET_MSG_KEY, Message.class); SendResult sendResult = context.getActionContext(ROCKET_SEND_RESULT_KEY, SendResult.class); if (checkMqStatus(message, sendResult)) { - LOGGER.error("TCCRocketMQ rollback but cannot find message and sendResult"); + LOGGER.error("TCCRocketMQ rollback but cannot find message or sendResult"); return true; } this.producerImpl.endTransaction(message, sendResult, LocalTransactionState.ROLLBACK_MESSAGE, null);