Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 074C4200C2B for ; Thu, 2 Mar 2017 16:05:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 04778160B88; Thu, 2 Mar 2017 15:05:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5133F160B6F for ; Thu, 2 Mar 2017 16:05:36 +0100 (CET) Received: (qmail 55392 invoked by uid 500); 2 Mar 2017 15:05:35 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 55293 invoked by uid 99); 2 Mar 2017 15:05:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 15:05:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54A27DFC15; Thu, 2 Mar 2017 15:05:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 02 Mar 2017 15:05:37 -0000 Message-Id: <390ace3af8df48c587da3349c38cc305@git.apache.org> In-Reply-To: <549cadbf627048ab90dbf12bb24d5fcc@git.apache.org> References: <549cadbf627048ab90dbf12bb24d5fcc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/29] activemq-artemis git commit: fixing AMQP archived-at: Thu, 02 Mar 2017 15:05:37 -0000 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/99ee2cce Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/99ee2cce Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/99ee2cce Branch: refs/heads/artemis-1009 Commit: 99ee2cce58a2e8ab3f975469b34ffe4befce208e Parents: ea358aa Author: Clebert Suconic Authored: Wed Mar 1 16:19:51 2017 -0500 Committer: Clebert Suconic Committed: Thu Mar 2 10:05:21 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/99ee2cce/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 {