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 3B3A7200C4B for ; Tue, 21 Mar 2017 00:01:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3A082160B8F; Mon, 20 Mar 2017 23:01:39 +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 7CDDA160B76 for ; Tue, 21 Mar 2017 00:01:38 +0100 (CET) Received: (qmail 86901 invoked by uid 500); 20 Mar 2017 23:01:37 -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 86892 invoked by uid 99); 20 Mar 2017 23:01:37 -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; Mon, 20 Mar 2017 23:01:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7FDECDF989; Mon, 20 Mar 2017 23:01:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Date: Mon, 20 Mar 2017 23:01:39 -0000 Message-Id: <801656d5aa8b4f4f9199a910bf7d3788@git.apache.org> In-Reply-To: <01686a0fa3a04ba781beb35d75c79ff9@git.apache.org> References: <01686a0fa3a04ba781beb35d75c79ff9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] activemq-artemis git commit: This closes #1110 archived-at: Mon, 20 Mar 2017 23:01:39 -0000 This closes #1110 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/150f67f8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/150f67f8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/150f67f8 Branch: refs/heads/master Commit: 150f67f8622cb8b67e7b68e327db387178f6ad70 Parents: 9385ce4 65ac7f7 Author: Timothy Bish Authored: Mon Mar 20 19:00:59 2017 -0400 Committer: Timothy Bish Committed: Mon Mar 20 19:00:59 2017 -0400 ---------------------------------------------------------------------- .../activemq/artemis/api/core/Message.java | 44 +++++-- .../artemis/core/message/impl/CoreMessage.java | 4 +- .../protocol/amqp/broker/AMQPMessage.java | 105 +++++++++++---- .../amqp/proton/ProtonServerSenderContext.java | 2 +- .../core/protocol/openwire/OpenwireMessage.java | 4 +- .../impl/journal/LargeServerMessageImpl.java | 2 +- .../core/postoffice/impl/BindingsImpl.java | 4 +- .../core/postoffice/impl/PostOfficeImpl.java | 4 +- .../artemis/core/server/impl/DivertImpl.java | 2 + .../artemis/core/server/impl/QueueImpl.java | 18 ++- .../impl/ScheduledDeliveryHandlerTest.java | 4 +- .../transport/amqp/client/AmqpMessage.java | 2 +- .../integration/amqp/AmqpClientTestSupport.java | 88 +------------ .../integration/amqp/AmqpNettyFailoverTest.java | 1 - .../tests/integration/amqp/AmqpTestSupport.java | 127 +++++++++++++++++++ .../amqp/SendingAndReceivingTest.java | 123 +++++++++++++++++- .../integration/client/AcknowledgeTest.java | 4 +- 17 files changed, 395 insertions(+), 143 deletions(-) ----------------------------------------------------------------------