Skip to content
Permalink
Browse files
revert rev 735101 in trunk see comments on GERONIMO-4519
  • Loading branch information
Lin Sun committed Jan 23, 2009
1 parent ec25665 commit 80811f71d06a42cddc90e52d2e7527661fdde998
Showing 1 changed file with 1 addition and 6 deletions.
@@ -475,10 +475,10 @@ public void rollback() throws IllegalStateException, SystemException {
default:
throw new IllegalStateException("Status is " + getStateString(status));
}
rms = resourceManagers;
}

endResources();
rms = resourceManagers;
try {
rollbackResources(rms);
//only write rollback record if we have already written prepare record.
@@ -573,11 +573,6 @@ private void endResources(IdentityHashMap resourceMap) {
log.warn("Error ending association for XAResource " + xaRes + "; transaction will roll back. XA error code: " + e.errorCode, e);
synchronized (this) {
status = Status.STATUS_MARKED_ROLLBACK;
// when XAException is XA_RBROLLBACK, which indicates that XAResource has already rolled back the transaction, no need
// to send rollback request to the XAResource, thus remove it off resourceManagers list.
if (e.errorCode == XAException.XA_RBROLLBACK) {
resourceManagers.remove(manager);
}
}
}
}

0 comments on commit 80811f7

Please sign in to comment.