ozeigermann 2004/07/14 01:26:11
Modified: transaction/src/java/org/apache/commons/transaction/util/xa
AbstractXAResource.java
Log:
Make wrapping of Xid more dynamic as some JTA impls require the branch others do not
Revision Changes Path
1.4 +11 -9
jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/util/xa/AbstractXAResource.java
Index: AbstractXAResource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/util/xa/AbstractXAResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractXAResource.java 12 Jul 2004 14:47:41 -0000 1.3
+++ AbstractXAResource.java 14 Jul 2004 08:26:11 -0000 1.4
@@ -50,6 +50,8 @@
protected abstract LoggerFacade getLoggerFacade();
+ protected abstract boolean includeBranchInXid();
+
public void forget(Xid xid) throws XAException {
getLoggerFacade().logFine("Preparing transaction branch " + xid);
TransactionalResource ts = getTransactionalResource(xid);
@@ -196,32 +198,32 @@
else return getSuspendedTransactionalResource(xid);
}
protected TransactionalResource getActiveTransactionalResource(Xid xid) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
return (TransactionalResource) activeContexts.get(wxid);
}
protected TransactionalResource getSuspendedTransactionalResource(Xid xid) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
return (TransactionalResource) suspendedContexts.get(wxid);
}
protected void addAcitveTransactionalResource(Xid xid, TransactionalResource
txContext) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
activeContexts.put(wxid, txContext);
}
protected void addSuspendedTransactionalResource(Xid xid, TransactionalResource
txContext) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
suspendedContexts.put(wxid, txContext);
}
protected void removeActiveTransactionalResource(Xid xid) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
activeContexts.remove(wxid);
}
protected void removeSuspendedTransactionalResource(Xid xid) {
- Xid wxid = XidWrapper.wrap(xid);
+ Xid wxid = XidWrapper.wrap(xid, includeBranchInXid());
suspendedContexts.remove(wxid);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
