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

This closes #2046

This commit is contained in:
Clebert Suconic 2018-04-25 14:53:52 -04:00
parent 932f0f4086 6598ab271f
commit f37df329d9
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java
View File

@ -129,7 +129,9 @@ public class ResourceManagerImpl implements ResourceManager {
Map<Xid, Long> xidsWithCreationTime = new HashMap<>();
for (Map.Entry<Xid, Transaction> entry : transactions.entrySet()) {
xidsWithCreationTime.put(entry.getKey(), entry.getValue().getCreateTime());
if (entry.getValue().getState() == Transaction.State.PREPARED) {
xidsWithCreationTime.put(entry.getKey(), entry.getValue().getCreateTime());
}
}
return xidsWithCreationTime;
}

23
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -914,12 +914,29 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
clientSession.end(xid, XAResource.TMSUCCESS);
clientSession.prepare(xid);
// add another TX, but don't prepare it
ClientMessage m5 = createTextMessage(clientSession, "");
ClientMessage m6 = createTextMessage(clientSession, "");
ClientMessage m7 = createTextMessage(clientSession, "");
ClientMessage m8 = createTextMessage(clientSession, "");
m5.putStringProperty("m5", "m5");
m6.putStringProperty("m6", "m6");
m7.putStringProperty("m7", "m7");
m8.putStringProperty("m8", "m8");
Xid xid2 = newXID();
clientSession.start(xid2, XAResource.TMNOFLAGS);
clientProducer.send(m5);
clientProducer.send(m6);
clientProducer.send(m7);
clientProducer.send(m8);
clientSession.end(xid2, XAResource.TMSUCCESS);
ActiveMQServerControl serverControl = createManagementControl();
JsonArray jsonArray = JsonUtil.readJsonArray(serverControl.listProducersInfoAsJSON());
assertEquals(1, jsonArray.size());
assertEquals(4, ((JsonObject) jsonArray.get(0)).getInt("msgSent"));
assertEquals(8, ((JsonObject) jsonArray.get(0)).getInt("msgSent"));
clientSession.close();
locator.close();
@ -930,6 +947,10 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertTrue(txDetails.matches(".*m2.*"));
Assert.assertTrue(txDetails.matches(".*m3.*"));
Assert.assertTrue(txDetails.matches(".*m4.*"));
Assert.assertFalse(txDetails.matches(".*m5.*"));
Assert.assertFalse(txDetails.matches(".*m6.*"));
Assert.assertFalse(txDetails.matches(".*m7.*"));
Assert.assertFalse(txDetails.matches(".*m8.*"));
}
@Test