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

AMQ-5815 - remove obsolete remnant of fix for AMQ-2594. holding global lock before attempting to get index and checkpoint lock can lead to deadlock if checkpoint write lock request pops in

This commit is contained in:
gtully 2016-08-15 11:37:38 +01:00
parent 330f0ce734
commit 6d44ae6e97
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-broker/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
View File

@ -88,20 +88,15 @@ public class LocalTransaction extends Transaction {
}
setState(Transaction.FINISHED_STATE);
context.getTransactions().remove(xid);
// Sync on transaction store to avoid out of order messages in the cursor
// https://issues.apache.org/activemq/browse/AMQ-2594
synchronized (transactionStore) {
transactionStore.rollback(getTransactionId());
try {
fireAfterRollback();
} catch (Throwable e) {
LOG.warn("POST ROLLBACK FAILED: ", e);
XAException xae = new XAException("POST ROLLBACK FAILED");
xae.errorCode = XAException.XAER_RMERR;
xae.initCause(e);
throw xae;
}
transactionStore.rollback(getTransactionId());
try {
fireAfterRollback();
} catch (Throwable e) {
LOG.warn("POST ROLLBACK FAILED: ", e);
XAException xae = new XAException("POST ROLLBACK FAILED");
xae.errorCode = XAException.XAER_RMERR;
xae.initCause(e);
throw xae;
}
}