GERONIMO-5648 fix some errors in RollbackTask shown by osgi tx tests
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@1028958 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
index 7ea6722..7c78190 100644
--- a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
+++ b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
@@ -90,7 +90,7 @@
} else if (e.errorCode == XAException.XAER_RMFAIL) {
//refresh the xa resource from the NamedXAResourceFactory
if (manager.getCommitter() instanceof NamedXAResource) {
- String xaResourceName = ((NamedXAResource)manager.getCommitter()).getName();
+ String xaResourceName = manager.getResourceName();
NamedXAResourceFactory namedXAResourceFactory = txManager.getNamedXAResourceFactory(xaResourceName);
if (namedXAResourceFactory != null) {
try {
diff --git a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RollbackTask.java b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RollbackTask.java
index c8170ca..78f83bf 100644
--- a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RollbackTask.java
+++ b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RollbackTask.java
@@ -52,6 +52,7 @@
this.txManager = txManager;
}
+ @Override
public void run() {
synchronized (this) {
status = Status.STATUS_ROLLING_BACK;
@@ -66,7 +67,10 @@
} catch (XAException e) {
log.error("Unexpected exception committing " + manager.getCommitter() + "; continuing to commit other RMs", e);
- if (e.errorCode == XAException.XA_HEURRB) {
+ if (e.errorCode >= XAException.XA_RBBASE && e.errorCode <= XAException.XA_RBEND || e.errorCode == XAException.XAER_NOTA) {
+ remove(index);
+ everRolledBack = true;
+ } else if (e.errorCode == XAException.XA_HEURRB) {
remove(index);
// let's not throw an exception as the transaction has been rolled back
log.info("Transaction has been heuristically rolled back");
@@ -86,10 +90,10 @@
} else if (e.errorCode == XAException.XA_RETRY) {
// do nothing, retry later
index++;
- } else if (e.errorCode == XAException.XAER_RMFAIL) {
+ } else if (e.errorCode == XAException.XAER_RMFAIL || e.errorCode == XAException.XAER_RMERR) {
//refresh the xa resource from the NamedXAResourceFactory
if (manager.getCommitter() instanceof NamedXAResource) {
- String xaResourceName = ((NamedXAResource)manager.getCommitter()).getName();
+ String xaResourceName = manager.getResourceName();
NamedXAResourceFactory namedXAResourceFactory = txManager.getNamedXAResourceFactory(xaResourceName);
if (namedXAResourceFactory != null) {
try {
@@ -106,15 +110,10 @@
index++;
}
} else {
- //no hope
+ //no hope. Since we don't record the exception if we do manage to retry stuff later, presumably we shouldn't now, either.
remove(index);
- cause = e;
}
} else {
- //at least these error codes:
- // XAException.XA_RMERR
- // XAException.XA_RBROLLBACK
- // XAException.XAER_NOTA
//nothing we can do about it
remove(index);
cause = e;
