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 <[email protected]> Authored: Mon Mar 20 19:00:59 2017 -0400 Committer: Timothy Bish <[email protected]> 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(-) ----------------------------------------------------------------------
