Repository: activemq-artemis Updated Branches: refs/heads/artemis-1009 5cf9e7580 -> bcc24c473
fixing AMQP Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bcc24c47 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bcc24c47 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bcc24c47 Branch: refs/heads/artemis-1009 Commit: bcc24c473eeda27b935940ebad1a34b07a00cdae Parents: 5cf9e75 Author: Clebert Suconic <[email protected]> Authored: Wed Mar 1 16:19:51 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Wed Mar 1 16:19:51 2017 -0500 ---------------------------------------------------------------------- .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bcc24c47/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java index 7fabefd..d39bf9d 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java @@ -203,6 +203,10 @@ public class AMQPMessage extends RefCountMessage { headerEnd = buffer.position(); _header = (Header) section; + if (_header.getTtl() != null) { + this.expiration = System.currentTimeMillis() + _header.getTtl().intValue(); + } + if (!readApplicationProperties) { return; } @@ -243,10 +247,6 @@ public class AMQPMessage extends RefCountMessage { if (section instanceof Properties) { _properties = (Properties) section; - if (_header.getTtl() != null) { - this.expiration = System.currentTimeMillis() + _header.getTtl().intValue(); - } - if (buffer.hasRemaining()) { section = (Section) decoder.readObject(); } else {
