Repository: activemq-artemis Updated Branches: refs/heads/master 8dd6b712f -> 7610dadaf
This closes #1337 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7610dada Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7610dada Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7610dada Branch: refs/heads/master Commit: 7610dadaf36d4fb05cdf35f900c840ef5496a173 Parents: 8dd6b71 44b7e45 Author: Martyn Taylor <[email protected]> Authored: Mon Jun 19 12:44:13 2017 +0100 Committer: Martyn Taylor <[email protected]> Committed: Mon Jun 19 12:44:13 2017 +0100 ---------------------------------------------------------------------- .../config/ActiveMQDefaultConfiguration.java | 6 ++ .../artemis/jms/client/ActiveMQDestination.java | 6 +- .../artemis/jms/client/ActiveMQSession.java | 6 +- .../amqp/broker/ProtonProtocolManager.java | 3 +- .../client/AMQPClientConnectionFactory.java | 4 +- .../amqp/proton/AMQPConnectionContext.java | 8 ++ .../amqp/proton/ProtonServerSenderContext.java | 52 +++++++++--- .../protocol/openwire/OpenWireConnection.java | 2 +- .../core/protocol/openwire/amq/AMQConsumer.java | 2 +- .../ra/inflow/ActiveMQMessageHandler.java | 2 +- .../artemis/core/config/Configuration.java | 10 +++ .../core/config/impl/ConfigurationImpl.java | 14 ++++ .../deployers/impl/FileConfigurationParser.java | 6 ++ .../resources/schema/artemis-configuration.xsd | 10 +++ .../impl/DefaultsFileConfigurationTest.java | 2 + .../core/config/impl/FileConfigurationTest.java | 1 + .../resources/ConfigurationTest-full-config.xml | 1 + .../amqp/ClientDefinedMultiConsumerTest.java | 32 ++++---- .../integration/amqp/JMSClientTestSupport.java | 52 ++++++++++++ .../amqp/JMSDurableConsumerTest.java | 22 ++++++ .../integration/amqp/JMSSharedConsumerTest.java | 79 ++++++------------- .../amqp/JMSSharedDurableConsumerTest.java | 83 +++++++------------- 22 files changed, 255 insertions(+), 148 deletions(-) ----------------------------------------------------------------------
