### Eclipse Workspace Patch 1.0 #P JBoss-EAP-5 Index: connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java =================================================================== --- connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java (revision 99382) +++ connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java (working copy) @@ -124,6 +124,7 @@ * @author David Jencks * @author Adrian Brock * @author Weston Price + * @author Tyronne Wickramarathne * @version $Revision$ */ public class TxConnectionManager extends BaseConnectionManager2 implements TxConnectionManagerMBean @@ -328,7 +329,7 @@ { int status = tx.getStatus(); // Only allow states that will actually succeed - if (status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING && status != Status.STATUS_PREPARED && status != Status.STATUS_COMMITTING) + if (status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING && status != Status.STATUS_PREPARED && status != Status.STATUS_COMMITTING && status != Status.STATUS_MARKED_ROLLBACK) throw new RollbackException("Transaction " + tx + " cannot proceed " + TxUtils.getStatusAsString(status)); } }