You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/03/16 13:24:32 UTC
svn commit: r923707 - in /activemq/branches/activemq-5.3/activemq-core:
pom.xml src/main/java/org/apache/activemq/transaction/LocalTransaction.java
Author: dejanb
Date: Tue Mar 16 12:24:32 2010
New Revision: 923707
URL: http://svn.apache.org/viewvc?rev=923707&view=rev
Log:
merging 923706 - https://issues.apache.org/activemq/browse/AMQ-2594 - jdbc out of order messages
Modified:
activemq/branches/activemq-5.3/activemq-core/pom.xml
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
Modified: activemq/branches/activemq-5.3/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/pom.xml?rev=923707&r1=923706&r2=923707&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/pom.xml Tue Mar 16 12:24:32 2010
@@ -520,8 +520,6 @@
<!-- used just to test potential memory leaks manually -->
<exclude>**/JDBCTestMemory.*</exclude>
- <!-- exclude until AMQ-2594 is fixed-->
- <exclude>**/JDBCNegativeQueueTest.*</exclude>
<exclude>**/amq1490/*</exclude>
<exclude>**/AMQ1925*</exclude>
Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java?rev=923707&r1=923706&r2=923707&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java Tue Mar 16 12:24:32 2010
@@ -67,6 +67,8 @@ public class LocalTransaction extends Tr
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.commit(getTransactionId(), false);
@@ -92,6 +94,8 @@ public class LocalTransaction extends Tr
}
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());