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

Ensure that the connection info sent to the broker before doing XA operations. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@465682 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-10-19 17:06:27 +00:00
parent 6ba79b58d4
commit 05586eda6f
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
View File

@ -381,7 +381,8 @@ public class TransactionContext implements XAResource {
} }
public void rollback(Xid xid) throws XAException { public void rollback(Xid xid) throws XAException {
if( log.isDebugEnabled() )
if( log.isDebugEnabled() )
log.debug("Rollback: "+xid); log.debug("Rollback: "+xid);
// We allow interleaving multiple transactions, so // We allow interleaving multiple transactions, so
@ -399,6 +400,9 @@ public class TransactionContext implements XAResource {
} }
try { try {
this.connection.checkClosedOrFailed();
this.connection.ensureConnectionInfoSent();
// Let the server know that the tx is rollback. // Let the server know that the tx is rollback.
TransactionInfo info = new TransactionInfo(getConnectionId(), x, TransactionInfo.ROLLBACK); TransactionInfo info = new TransactionInfo(getConnectionId(), x, TransactionInfo.ROLLBACK);
this.connection.syncSendPacket(info); this.connection.syncSendPacket(info);
@ -435,6 +439,8 @@ public class TransactionContext implements XAResource {
try { try {
this.connection.checkClosedOrFailed();
this.connection.ensureConnectionInfoSent();
// Notify the server that the tx was committed back // Notify the server that the tx was committed back
TransactionInfo info = new TransactionInfo(getConnectionId(), x, TransactionInfo info = new TransactionInfo(getConnectionId(), x,
@ -504,7 +510,10 @@ public class TransactionContext implements XAResource {
TransactionInfo info = new TransactionInfo(getConnectionId(), null, TransactionInfo.RECOVER); TransactionInfo info = new TransactionInfo(getConnectionId(), null, TransactionInfo.RECOVER);
try { try {
DataArrayResponse receipt = (DataArrayResponse) this.connection.syncSendPacket(info); this.connection.checkClosedOrFailed();
this.connection.ensureConnectionInfoSent();
DataArrayResponse receipt = (DataArrayResponse) this.connection.syncSendPacket(info);
return (XATransactionId[]) receipt.getData(); return (XATransactionId[]) receipt.getData();
} catch (JMSException e) { } catch (JMSException e) {
throw toXAException(e); throw toXAException(e);
@ -529,7 +538,15 @@ public class TransactionContext implements XAResource {
} }
private void setXid(Xid xid) throws XAException { private void setXid(Xid xid) throws XAException {
if (xid != null) {
try {
this.connection.checkClosedOrFailed();
this.connection.ensureConnectionInfoSent();
} catch (JMSException e) {
throw toXAException(e);
}
if (xid != null) {
// associate // associate
associatedXid = xid; associatedXid = xid;
transactionId = new XATransactionId(xid); transactionId = new XATransactionId(xid);