Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6586 

Merge branch 'AMQ-6586' into activemq-5.14.x

This closes #225
This commit is contained in:
Christopher L. Shannon (cshannon) 2017-01-31 15:32:10 -05:00
parent 776418bae6 659d1f6ba5
commit cd82533f35
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
View File

@ -191,9 +191,9 @@ public class QueuePurgeTest extends CombinationTestSupport {
private void testConcurrentPurgeAndSend(boolean prioritizedMessages) throws Exception { private void testConcurrentPurgeAndSend(boolean prioritizedMessages) throws Exception {
applyBrokerSpoolingPolicy(false); applyBrokerSpoolingPolicy(false);
createProducerAndSendMessages(NUM_TO_SEND / 2); createProducerAndSendMessages(NUM_TO_SEND / 2);
QueueViewMBean proxy = getProxyToQueueViewMBean(); final QueueViewMBean proxy = getProxyToQueueViewMBean();
createConsumer(); createConsumer();
long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
ExecutorService service = Executors.newFixedThreadPool(1); ExecutorService service = Executors.newFixedThreadPool(1);
try { try {
LOG.info("purging.."); LOG.info("purging..");

2
activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportCloseSocketTest.java
View File

@ -105,7 +105,7 @@ public class TcpTransportCloseSocketTest {
factory.setBrokerURL(uri); factory.setBrokerURL(uri);
factory.setClientID("id"); factory.setClientID("id");
TcpTransportServer server = (TcpTransportServer) brokerService.getTransportConnectorByName("tcp").getServer(); final TcpTransportServer server = (TcpTransportServer) brokerService.getTransportConnectorByName("tcp").getServer();
//Try and create 2 connections, the second should fail because of a duplicate clientId //Try and create 2 connections, the second should fail because of a duplicate clientId
int failed = 0; int failed = 0;