This is an automated email from the ASF dual-hosted git repository.

lizhimin 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 b6267b9ccb [ISSUE #9486] Fix missing of valueOfCurrentMinusBorn equals 
checkImmunityTime (#9487)
b6267b9ccb is described below

commit b6267b9ccb8f7aa0dd5aa493323c36f5df086748
Author: WJ66880 <[email protected]>
AuthorDate: Sat Jun 28 14:43:28 2025 +0800

    [ISSUE #9486] Fix missing of valueOfCurrentMinusBorn equals 
checkImmunityTime (#9487)
---
 .../broker/transaction/queue/TransactionalMessageServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
index 017803c624..fb6c9de3f3 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
@@ -277,7 +277,7 @@ public class TransactionalMessageServiceImpl implements 
TransactionalMessageServ
                         String checkImmunityTimeStr = 
msgExt.getUserProperty(MessageConst.PROPERTY_CHECK_IMMUNITY_TIME_IN_SECONDS);
                         if (null != checkImmunityTimeStr) {
                             checkImmunityTime = 
getImmunityTime(checkImmunityTimeStr, transactionTimeout);
-                            if (valueOfCurrentMinusBorn < checkImmunityTime) {
+                            if (valueOfCurrentMinusBorn <= checkImmunityTime) {
                                 if (checkPrepareQueueOffset(removeMap, 
doneOpOffset, msgExt, checkImmunityTimeStr)) {
                                     newOffset = i + 1;
                                     i++;
@@ -285,7 +285,7 @@ public class TransactionalMessageServiceImpl implements 
TransactionalMessageServ
                                 }
                             }
                         } else {
-                            if (0 <= valueOfCurrentMinusBorn && 
valueOfCurrentMinusBorn < checkImmunityTime) {
+                            if (0 <= valueOfCurrentMinusBorn && 
valueOfCurrentMinusBorn <= checkImmunityTime) {
                                 log.debug("New arrived, the miss offset={}, 
check it later checkImmunity={}, born={}", i,
                                     checkImmunityTime, new 
Date(msgExt.getBornTimestamp()));
                                 break;

Reply via email to