diff --git a/README.md b/README.md index 1c17c7e242f044a513e7f399e175a13cf5a73721..33b42800cf31d33ed3e49177a33e382dfda97de1 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,12 @@ It offers a variety of features: * Pub/Sub messaging model -* Scheduled message delivery +* Financial grade transactional message +* A variety of cross language clients, such as Java, C/C++, Python, Go +* Pluggable transport protocols, such as TCP, SSL, AIO +* Inbuilt message tracing capability, also support opentracing +* Versatile big-data and streaming ecosytem integration * Message retroactivity by time or offset -* Log hub for streaming -* Big data integration * Reliable FIFO and strict ordered messaging in the same queue * Efficient pull&push consumption model * Million-level message accumulation capacity in a single queue @@ -21,9 +23,7 @@ It offers a variety of features: * Various message filter mechanics such as SQL and Tag * Docker images for isolated testing and cloud isolated clusters * Feature-rich administrative dashboard for configuration, metrics and monitoring -* Access control list -* Message trace - +* Authentication and authorisation ---------- 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 index 95696d91b475cc353a14288330e36631b965a7e0..5b7ba9c6f79d24adb5e9e48b7d777e6c2aa0c018 100644 --- 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 @@ -1188,6 +1188,12 @@ public class DefaultMQProducerImpl implements MQProducerInner { if (null == localTransactionExecuter && null == transactionListener) { throw new MQClientException("tranExecutor is null", null); } + + // ignore DelayTimeLevel parameter + if (msg.getDelayTimeLevel() != 0) { + MessageAccessor.clearProperty(msg, MessageConst.PROPERTY_DELAY_TIME_LEVEL); + } + Validators.checkMessage(msg, this.defaultMQProducer); SendResult sendResult = null; diff --git a/pom.xml b/pom.xml index 0161c7b924727521bb87ca3e78f5fef614a4236c..14b10fae72f9aebc6ddc42730c40a7fceed50dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -569,7 +569,7 @@ com.alibaba fastjson - 1.2.51 + 1.2.61 org.javassist