[ISSUE #9999] Mark custom delay time messages with delay type (#10000)

yx9o · web-flow · commit 04711367b737 · 2026-02-05T09:48:45.000+08:00
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
@@ -980,7 +980,11 @@ private SendResult sendKernelImpl(final Message msg,
                         context.setMsgType(MessageType.Trans_Msg_Half);
                     }
 
-                    if (msg.getProperty("__STARTDELIVERTIME") != null || msg.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null) {
+                    if (msg.getProperty("__STARTDELIVERTIME") != null
+                            || msg.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null
+                            || msg.getProperty(MessageConst.PROPERTY_TIMER_DELIVER_MS) != null
+                            || msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null
+                            || msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_MS) != null) {
                         context.setMsgType(MessageType.Delay_Msg);
                     }
                     this.executeSendMessageHookBefore(context);

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,11 @@ private SendResult sendKernelImpl(final Message msg,`
`980`	`980`	`context.setMsgType(MessageType.Trans_Msg_Half);`
`981`	`981`	`}`
`982`	`982`
`983`		`- if (msg.getProperty("__STARTDELIVERTIME") != null \|\| msg.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null) {`
	`983`	`+ if (msg.getProperty("__STARTDELIVERTIME") != null`
	`984`	`+ \|\| msg.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null`
	`985`	`+ \|\| msg.getProperty(MessageConst.PROPERTY_TIMER_DELIVER_MS) != null`
	`986`	`+ \|\| msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null`
	`987`	`+ \|\| msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_MS) != null) {`
`984`	`988`	`context.setMsgType(MessageType.Delay_Msg);`
`985`	`989`	`}`
`986`	`990`	`this.executeSendMessageHookBefore(context);`