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

NullPointerException when trying to list prepared transactions as JSON

This commit is contained in:
Tom Ross 2015-12-07 17:57:43 +00:00 committed by Clebert Suconic
parent a95784096d
commit f29ab83727
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionDetail.java
View File

@ -72,7 +72,13 @@ public abstract class TransactionDetail {
detailJson.put(KEY_XID_BRANCH_QUAL, new String(this.xid.getBranchQualifier())); detailJson.put(KEY_XID_BRANCH_QUAL, new String(this.xid.getBranchQualifier()));
JSONArray msgsJson = new JSONArray(); JSONArray msgsJson = new JSONArray();
List<TransactionOperation> txops = this.transaction.getAllOperations();
List<TransactionOperation> txops = null;
if (this.transaction != null) {
txops = this.transaction.getAllOperations();
}
detailJson.put(KEY_TX_RELATED_MESSAGES, msgsJson); detailJson.put(KEY_TX_RELATED_MESSAGES, msgsJson);
if (txops == null) { if (txops == null) {
return detailJson; return detailJson;

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

@ -392,8 +392,14 @@ public class TransactionImpl implements Transaction {
@Override @Override
public synchronized List<TransactionOperation> getAllOperations() { public synchronized List<TransactionOperation> getAllOperations() {
if (operations != null) {
return new ArrayList<TransactionOperation>(operations); return new ArrayList<TransactionOperation>(operations);
} }
else {
return new ArrayList<TransactionOperation>();
}
}
@Override @Override
public void putProperty(final int index, final Object property) { public void putProperty(final int index, final Object property) {