Author: gtully
Date: Tue Mar 30 14:02:40 2010
New Revision: 929145
URL: http://svn.apache.org/viewvc?rev=929145&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2670 - revert XA
connection manager, using out of band recovery via JMS api is a workaround for
jboss pending RAR based auto recovery or enlistment, comments in the jira with
the relevant config
Removed:
activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQXAManagedConnectionFactory.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java?rev=929145&r1=929144&r2=929145&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
Tue Mar 30 14:02:40 2010
@@ -128,12 +128,18 @@ public class TransactionBroker extends B
for (Iterator<Transaction> iter =
xaTransactions.values().iterator(); iter.hasNext();) {
Transaction tx = iter.next();
if (tx.isPrepared()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("prepared transaction: " +
tx.getTransactionId());
+ }
txs.add(tx.getTransactionId());
}
}
}
XATransactionId rc[] = new XATransactionId[txs.size()];
txs.toArray(rc);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("prepared transacton list size: " + rc.length);
+ }
return rc;
}