Merge branch 'ARTEMIS-1861' This closes #2087
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/30cac209 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/30cac209 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/30cac209 Branch: refs/heads/master Commit: 30cac2090281e378d20fb749cb1366005dc2d8c1 Parents: 2ea77d3 9e00852 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Fri May 11 13:21:21 2018 -0400 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Fri May 11 13:21:48 2018 -0400 ---------------------------------------------------------------------- .../amqp/broker/ProtonProtocolManager.java | 7 ++--- .../protocol/amqp/proton/AMQPConstants.java | 2 -- .../protocol/amqp/proton/AmqpSupport.java | 1 + .../amqp/AmqpInboundConnectionTest.java | 25 ++++++++++++++++++ .../integration/amqp/AmqpMaxFrameSizeTest.java | 27 ++++++++++++++++++++ 5 files changed, 57 insertions(+), 5 deletions(-) ----------------------------------------------------------------------