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

[ARTEMIS-1666] List of prepared transaction details returns Object.toString() instead of Json string

This commit is contained in:
Yeray Borges 2018-02-07 14:56:37 +00:00 committed by Justin Bertram
parent a90adaed51
commit de7f6de094
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
View File

@ -1367,7 +1367,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
TransactionDetail detail = new JMSTransactionDetail(xid, tx, entry.getValue()); TransactionDetail detail = new JMSTransactionDetail(xid, tx, entry.getValue());
txDetailListJson.add(detail.toJSON()); txDetailListJson.add(detail.toJSON());
} }
return txDetailListJson.toString(); return txDetailListJson.build().toString();
} }
@Override @Override

3
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
View File

@ -860,7 +860,8 @@ public class JMSServerControlTest extends ManagementTestBase {
ss.close(); ss.close();
control.listPreparedTransactionDetailsAsJSON(); String result = control.listPreparedTransactionDetailsAsJSON();
Assert.assertTrue("".equals(result) || (JsonUtil.readJsonArray(result) instanceof JsonArray));
} }
@Test @Test