package com.alibaba.rocketmq.client.consumer.cacheable;

import com.alibaba.rocketmq.client.producer.concurrent.DefaultLocalMessageStore;
import com.alibaba.rocketmq.common.message.Message;
import com.alibaba.rocketmq.common.message.MessageExt;

import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

public class DelayTask implements Runnable {
    private final MessageExt message;
    private final MessageHandler messageHandler;

    private final ScheduledExecutorService executorService;

    private DefaultLocalMessageStore localMessageStore;

    public DelayTask(ScheduledExecutorService executorService, MessageHandler messageHandler,
                     DefaultLocalMessageStore localMessageStore,
                     MessageExt message) {
        this.localMessageStore = localMessageStore;
        this.message = message;
        this.messageHandler = messageHandler;
        this.executorService = executorService;
    }

    @Override
    public void run() {
        Message[] messages = localMessageStore.pop();
        TreeMap<String, MessageExt> messageSet = getMessageTree(messages);

        Set<Map.Entry<String, MessageExt>> set = messageSet.entrySet();

        for (Map.Entry<String, MessageExt> entry : set) {
            MessageExt me = entry.getValue();
            Message mes = TranslateMsg.getMessageFromMessageExt(me);

            if (Long.parseLong(me.getProperty("next_time")) - System.currentTimeMillis() < 1000) {
                int result = messageHandler.handle(me);
                if (result > 0) {
                    mes.putUserProperty("next_time", String.valueOf(System.currentTimeMillis() + result));
                    localMessageStore.stash(mes);
                    this.executorService.schedule(this, result, TimeUnit.MILLISECONDS);
                }
            } else {
                localMessageStore.stash(mes);
            }
        }
    }

    private TreeMap<String, MessageExt> getMessageTree(Message[] messages) {
        TreeMap<String, MessageExt> messageTreeMap = new TreeMap<String, MessageExt>();

        for (final Message message : messages) {
            MessageExt me = TranslateMsg.getMessageExtFromMessage(message);
            me.putUserProperty("next_time", message.getProperty("next_time"));
            messageTreeMap.put(me.getMsgId(), me);
        }

        return messageTreeMap;
    }
}

@@ -2212,32 +2212,91 @@
 e : messages) %7B%0A
+            if (null == message)%0A                continue;%0A
             Mess

fix bug:make sure we get message is never null.