Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-9945 - Allow Transaction to rollback if marked-for-rollback-only

This commit is contained in:
Steve Ebersole 2015-07-18 13:28:08 -05:00
parent f0f852f14f
commit ee2099ff8a
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java
View File

@ -8,8 +8,6 @@ package org.hibernate.engine.transaction.internal;
import javax.transaction.Synchronization;
import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.Transaction;
import org.hibernate.TransactionException;
@ -17,6 +15,8 @@ import org.hibernate.internal.CoreLogging;
import org.hibernate.resource.transaction.TransactionCoordinator;
import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.jboss.logging.Logger;
import static org.hibernate.resource.transaction.TransactionCoordinator.TransactionDriver;
/**
@ -71,8 +71,8 @@ public class TransactionImpl implements Transaction {
@Override
public void rollback() {
TransactionStatus status = transactionDriverControl.getStatus();
if ( status != TransactionStatus.ACTIVE && status != TransactionStatus.FAILED_COMMIT ) {
throw new TransactionException( "Transaction not successfully started" );
if ( !status.canRollback() ) {
throw new TransactionException( "Cannot rollback transaction in current status [" + status.name() + "]" );
}
LOG.debug( "rolling back" );

23
hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionStatus.java
View File

@ -46,5 +46,26 @@ public enum TransactionStatus {
* Status code indicating a transaction that is in the process of
* rolling back.
*/
ROLLING_BACK
ROLLING_BACK;
public boolean isOneOf(TransactionStatus... statuses) {
for ( TransactionStatus status : statuses ) {
if ( this == status ) {
return true;
}
}
return false;
}
public boolean isNotOneOf(TransactionStatus... statuses) {
return !isOneOf( statuses );
}
public boolean canRollback() {
return isOneOf(
TransactionStatus.ACTIVE,
TransactionStatus.FAILED_COMMIT,
TransactionStatus.MARKED_ROLLBACK
);
}
}