HHH-9980 - Implement mark-for-rollback-only handling for JdbcResourceLocalTransactionCoordinatorImpl

Author: sebersole

hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java

@@ -10,6 +10,7 @@
 import java.util.List;
 import javax.transaction.Status;
 
+import org.hibernate.TransactionException;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.transaction.spi.IsolationDelegate;
 import org.hibernate.engine.transaction.spi.TransactionObserver;
@@ -185,6 +186,7 @@ public void removeObserver(TransactionObserver observer) {
 	public class TransactionDriverControlImpl implements TransactionDriver {
 		private final JdbcResourceTransaction jdbcResourceTransaction;
 		private boolean invalid;
+		private boolean rollbackOnly = false;
 
 		public TransactionDriverControlImpl(JdbcResourceTransaction jdbcResourceTransaction) {
 			super();
@@ -211,6 +213,10 @@ protected void errorIfInvalid() {
 
 		@Override
 		public void commit() {
+			if ( rollbackOnly ) {
+				throw new TransactionException( "Transaction was marked for rollback only; cannot commit" );
+			}
+
 			JdbcResourceLocalTransactionCoordinatorImpl.this.beforeCompletionCallback();
 			jdbcResourceTransaction.commit();
 			JdbcResourceLocalTransactionCoordinatorImpl.this.afterCompletionCallback( true );
@@ -229,7 +235,14 @@ public TransactionStatus getStatus() {
 
 		@Override
 		public void markRollbackOnly() {
+			if ( log.isDebugEnabled() ) {
+				log.debug(
+						"JDBC transaction marked for rollback-only (exception provided for stack trace)",
+						new Exception( "exception just for purpose of providing stack trace" )
+				);
+			}
 
+			rollbackOnly = true;
 		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.test.resource.transaction.jdbc;
 
+import org.hibernate.TransactionException;
 import org.hibernate.resource.transaction.TransactionCoordinator;
 import org.hibernate.resource.transaction.TransactionCoordinatorBuilder;
 import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl;
@@ -50,4 +51,33 @@ public boolean shouldAutoJoinTransaction() {
 		assertEquals( 0, sync.getFailedCompletionCount() );
 
 	}
+
+	@Test
+	@SuppressWarnings("EmptyCatchBlock")
+	public void testMarkRollbackOnly() {
+		final TransactionCoordinatorOwnerTestingImpl owner = new TransactionCoordinatorOwnerTestingImpl();
+		final JdbcResourceLocalTransactionCoordinatorBuilderImpl transactionCoordinatorBuilder =
+				new JdbcResourceLocalTransactionCoordinatorBuilderImpl();
+
+		final TransactionCoordinator transactionCoordinator = transactionCoordinatorBuilder.buildTransactionCoordinator(
+				owner,
+				new TransactionCoordinatorBuilder.TransactionCoordinatorOptions() {
+					@Override
+					public boolean shouldAutoJoinTransaction() {
+						return false;
+					}
+				}
+		);
+
+		transactionCoordinator.getTransactionDriverControl().begin();
+		transactionCoordinator.getTransactionDriverControl().markRollbackOnly();
+		try {
+			transactionCoordinator.getTransactionDriverControl().commit();
+		}
+		catch (TransactionException expected) {
+		}
+		finally {
+			transactionCoordinator.getTransactionDriverControl().rollback();
+		}
+	}
 }