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

ACTIVEMQ6-110 getDeliveringMessages() broken

This commit is contained in:
jbertram 2015-05-18 13:57:05 -05:00
parent fe093fcce3
commit 8561d60f54
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
View File

@ -918,7 +918,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener
public String toManagementString()
{
return "ServerConsumer [id=" + id + ", filter=" + filter + ", binding=" + binding.toManagementString() + "]";
return "ServerConsumer [id=" + getConnectionID() + ":" + getSessionID() + ":" + id + ", filter=" + filter + ", binding=" + binding.toManagementString() + "]";
}
@Override

16
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
View File

@ -529,15 +529,25 @@ public class QueueControlTest extends ManagementTestBase
assertEquals(msgRec.getIntProperty("key").intValue(), intValue);
assertEquals(1, srvqueue.getDeliveringCount());
ClientSessionFactory sf2 = createSessionFactory(locator);
ClientSession session2 = sf2.createSession(false, true, false);
ClientConsumer consumer2 = session2.createConsumer(queue);
session2.start();
ClientMessage msgRec2 = consumer2.receive(5000);
assertNotNull(msgRec2);
assertEquals(2, srvqueue.getDeliveringCount());
assertEquals(2, srvqueue.getConsumerCount());
assertEquals(2, server.getConnectionCount());
System.out.println(queueControl.listDeliveringMessagesAsJSON());
Map<String, Map<String, Object> []> deliveringMap = queueControl.listDeliveringMessages();
assertEquals(1, deliveringMap.size());
//Map<String, Object[]> msgs = deliveringMap.get(key)
assertEquals(2, deliveringMap.size());
consumer.close();
consumer2.close();
session.deleteQueue(queue);
}