You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/04/22 13:22:29 UTC
[3/3] activemq-6 git commit: Merge branch #209'
Merge branch #209'
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/47edcd40
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/47edcd40
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/47edcd40
Branch: refs/heads/master
Commit: 47edcd40149b2c2b84739f83b488962d7759740d
Parents: aa63819 81a7613
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Apr 22 12:21:46 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Apr 22 12:21:46 2015 +0100
----------------------------------------------------------------------
.../activemq/api/core/client/ClientSession.java | 19 ++++++++
.../activemq/jms/client/ActiveMQConnection.java | 6 +--
.../jms/client/ActiveMQMessageProducer.java | 14 +++---
.../management/impl/JMSServerControlImpl.java | 9 ++--
.../jms/server/impl/JMSServerManagerImpl.java | 41 ++++++++++++++++-
.../plug/ProtonSessionIntegrationCallback.java | 3 +-
.../protocol/openwire/OpenWireConnection.java | 47 +++++++-------------
.../protocol/openwire/amq/AMQServerSession.java | 7 ++-
.../openwire/amq/AMQServerSessionFactory.java | 5 ++-
.../core/protocol/openwire/amq/AMQSession.java | 13 +++---
.../protocol/stomp/StompProtocolManager.java | 4 +-
.../activemq/ra/inflow/ActiveMQActivation.java | 4 +-
.../activemq/core/postoffice/PostOffice.java | 11 ++---
.../core/postoffice/impl/PostOfficeImpl.java | 35 +++++++++++----
.../core/impl/ActiveMQPacketHandler.java | 2 +-
.../activemq/core/server/ActiveMQServer.java | 16 ++++++-
.../activemq/core/server/QueueCreator.java | 32 +++++++++++++
.../activemq/core/server/ServerSession.java | 2 +
.../core/server/ServerSessionFactory.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 38 ++++++++++++++--
.../activemq/core/server/impl/DivertImpl.java | 2 +-
.../activemq/core/server/impl/QueueImpl.java | 4 +-
.../core/server/impl/ServerSessionImpl.java | 44 +++++++++++++-----
.../management/impl/ManagementServiceImpl.java | 2 +-
.../vertx/IncomingVertxEventHandler.java | 2 +-
.../tests/extras/jms/bridge/JMSBridgeTest.java | 6 +--
.../client/AutoCreateJmsQueueTest.java | 32 +++++++++++++
.../integration/client/HangConsumerTest.java | 5 ++-
.../integration/openwire/OpenWireTestBase.java | 8 ++--
.../openwire/SimpleOpenWireTest.java | 27 +++++++++++
.../openwire/amq/ProducerFlowControlTest.java | 13 +++---
.../core/server/impl/fakes/FakePostOffice.java | 30 ++++---------
32 files changed, 346 insertions(+), 139 deletions(-)
----------------------------------------------------------------------