Repository: activemq Updated Branches: refs/heads/master 7e5042849 -> 109e9d22c
Merge pull request #3 from apache/master Synching with AMQ master Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/31fbc20c Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/31fbc20c Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/31fbc20c Branch: refs/heads/master Commit: 31fbc20cd6c21e5b011198a383e752ff27bf201c Parents: aa717e0 7e50428 Author: Jamie Goodyear <[email protected]> Authored: Fri Jul 27 21:51:43 2018 -0230 Committer: GitHub <[email protected]> Committed: Fri Jul 27 21:51:43 2018 -0230 ---------------------------------------------------------------------- .../activemq/broker/ProducerBrokerExchange.java | 10 +- .../activemq/broker/region/AbstractRegion.java | 26 +-- .../region/virtual/MappedQueueFilter.java | 5 +- .../network/DemandForwardingBridgeSupport.java | 2 +- .../transport/vm/VMTransportFactory.java | 2 +- .../broker/ProducerBrokerExchangeTest.java | 38 ++++ .../activemq/ActiveMQMessageConsumer.java | 2 +- .../apache/activemq/filter/DestinationMap.java | 28 ++- .../activemq/jms/pool/ConnectionPool.java | 4 +- .../activemq/jms/pool/ConnectionPoolTest.java | 74 ++++++++ .../store/kahadb/KahaDBPersistenceAdapter.java | 8 +- .../activemq/store/kahadb/MessageDatabase.java | 43 +++-- activemq-leveldb-store/pom.xml | 4 + .../activemq/ra/ActiveMQConnectionFactory.java | 1 + .../activemq/ra/ActiveMQConnectionSupport.java | 20 +++ .../ra/ActiveMQManagedConnectionFactory.java | 22 ++- .../apache/activemq/tool/JmsConsumerClient.java | 2 +- .../apache/activemq/tool/JmsProducerClient.java | 8 +- .../activemq/broker/XARecoveryBrokerTest.java | 72 +++++++- .../VirtualTopicDestinationMapAccessTest.java | 136 ++++++++++++++ .../DemandForwardingBridgeSupportTest.java | 179 +++++++++++++++++++ pom.xml | 16 +- 22 files changed, 632 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
