[rocketmq] branch develop updated: Fix using wrong offset when deliver in ScheduleService (#3967)

[duhengforever]

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

duhengforever 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 8cd9988  Fix using wrong offset when deliver in ScheduleService (#3967)
8cd9988 is described below

commit 8cd998829ab2c6f94ca6ad6d285f56f455e97790
Author: rongtong <jinrongto...@163.com>
AuthorDate: Mon Mar 14 19:29:15 2022 +0800

    Fix using wrong offset when deliver in ScheduleService (#3967)
---
 .../store/schedule/ScheduleMessageService.java         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/store/src/main/java/org/apache/rocketmq/store/schedule/ScheduleMessageService.java
 
b/store/src/main/java/org/apache/rocketmq/store/schedule/ScheduleMessageService.java
index d5b4e8d..f14b198 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/schedule/ScheduleMessageService.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/schedule/ScheduleMessageService.java
@@ -447,9 +447,9 @@ public class ScheduleMessageService extends ConfigManager {
 
                     boolean deliverSuc;
                     if (ScheduleMessageService.this.enableAsyncDeliver) {
-                        deliverSuc = this.asyncDeliver(msgInner, 
msgExt.getMsgId(), offset, offsetPy, sizePy);
+                        deliverSuc = this.asyncDeliver(msgInner, 
msgExt.getMsgId(), nextOffset, offsetPy, sizePy);
                     } else {
-                        deliverSuc = this.syncDeliver(msgInner, 
msgExt.getMsgId(), offset, offsetPy, sizePy);
+                        deliverSuc = this.syncDeliver(msgInner, 
msgExt.getMsgId(), nextOffset, offsetPy, sizePy);
                     }
 
                     if (!deliverSuc) {
@@ -787,24 +787,22 @@ public class ScheduleMessageService extends ConfigManager 
{
     public enum ProcessStatus {
         /**
          * In process, the processing result has not yet been returned.
-         * */
+         */
         RUNNING,
 
         /**
          * Put message success.
-         * */
+         */
         SUCCESS,
 
         /**
-         * Put message exception.
-         * When autoResend is true, the message will be resend.
-         * */
+         * Put message exception. When autoResend is true, the message will be 
resend.
+         */
         EXCEPTION,
 
         /**
-         * Skip put message.
-         * When the message cannot be looked, the message will be skipped.
-         * */
+         * Skip put message. When the message cannot be looked, the message 
will be skipped.
+         */
         SKIP,
     }
 }