merge #73 - a few fixes coming from former branches
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/28db9f98 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/28db9f98 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/28db9f98 Branch: refs/heads/master Commit: 28db9f9849be1863f63e42a4fc6396509f325cad Parents: 2ae6f36 4ebacc9 Author: Andy Taylor <[email protected]> Authored: Thu Jan 22 14:44:26 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Thu Jan 22 14:44:26 2015 +0000 ---------------------------------------------------------------------- .../api/jms/management/JMSQueueControl.java | 31 ++++++++++ .../management/impl/JMSQueueControlImpl.java | 62 ++++++++++++++++++-- .../integration/client/ConsumerStuckTest.java | 20 +++---- .../server/management/JMSQueueControlTest.java | 51 ++++++++++++++++ .../management/JMSQueueControlUsingJMSTest.java | 35 +++++++++++ .../ra/ActiveMQMessageHandlerTest.java | 40 +++++++++---- 6 files changed, 212 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
