diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java index 15ebf0870c..140504314a 100644 --- a/hibernate-core/src/main/java/org/hibernate/Transaction.java +++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java @@ -38,16 +38,6 @@ public interface Transaction extends EntityTransaction { */ TransactionStatus getStatus(); - /** - * Indicate whether a resource transaction is in progress. - * - * @param isMarkedRollbackConsideredActive whether to consider {@link TransactionStatus#MARKED_ROLLBACK} as active. - * - * @return boolean indicating whether transaction is in progress - * @throws HibernateException if an unexpected error condition is encountered. - */ - boolean isActive(boolean isMarkedRollbackConsideredActive); - /** * Register a user synchronization callback for this transaction. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java index d25dddc832..d5298aa2bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java @@ -6,7 +6,9 @@ */ package org.hibernate.engine.transaction.spi; +import org.hibernate.HibernateException; import org.hibernate.Transaction; +import org.hibernate.resource.transaction.spi.TransactionStatus; /** * @author Steve Ebersole @@ -28,4 +30,14 @@ public interface TransactionImplementor extends Transaction { default void invalidate() { // no-op : see @deprecated note } + + /** + * Indicate whether a resource transaction is in progress. + * + * @param isMarkedRollbackConsideredActive whether to consider {@link TransactionStatus#MARKED_ROLLBACK} as active. + * + * @return boolean indicating whether transaction is in progress + * @throws HibernateException if an unexpected error condition is encountered. + */ + boolean isActive(boolean isMarkedRollbackConsideredActive); } diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionCoordinator.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionCoordinator.java index 2ff3f23b52..39ce9ddd51 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionCoordinator.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionCoordinator.java @@ -191,11 +191,6 @@ public class BatchModeTransactionCoordinator implements TransactionCoordinator { return false; } - @Override - public boolean isActive(boolean isMarkedRollbackConsideredActive) { - return false; - } - @Override public TransactionStatus getStatus() { return transactionDriver.getStatus();