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

https://issues.apache.org/jira/browse/AMQ-5080 - revert short circut of recover when failover transport is not connected - using maxstartupMaxReconnectAttempts=x provides a better alternative. tm recovery need not start a managed connection or call getConnection before a call to xaresource.recover

This commit is contained in:
gtully 2014-07-28 15:54:12 +01:00
parent 66a689df0e
commit 207d4cdee6
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
View File

@ -643,20 +643,11 @@ public class TransactionContext implements XAResource {
}
public Xid[] recover(int flag) throws XAException {
if (LOG.isDebugEnabled()) {
LOG.debug("Recover: " + flag);
}
LOG.debug("recover({})", flag);
TransactionInfo info = new TransactionInfo(getConnectionId(), null, TransactionInfo.RECOVER);
try {
this.connection.checkClosedOrFailed();
final FailoverTransport failoverTransport = this.connection.getTransport().narrow(FailoverTransport.class);
if (failoverTransport != null && !failoverTransport.isConnected()) {
// otherwise call will block on reconnect forfeting any app level periodic check
XAException xaException = new XAException("Failover transport not connected: " + this.getConnection());
xaException.errorCode = XAException.XAER_RMERR;
throw xaException;
}
this.connection.ensureConnectionInfoSent();
DataArrayResponse receipt = (DataArrayResponse)this.connection.syncSendPacket(info);
@ -668,7 +659,7 @@ public class TransactionContext implements XAResource {
answer = new XATransactionId[data.length];
System.arraycopy(data, 0, answer, 0, data.length);
}
LOG.trace("recover({})={}", flag, answer);
LOG.debug("recover({})={}", flag, answer);
return answer;
} catch (JMSException e) {
throw toXAException(e);