HHH-18867 correctly implement the documented semantics of beginTransaction()

hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java

@@ -68,6 +68,17 @@ public interface SharedSessionContract extends QueryProducer, AutoCloseable, Ser
 	 * Begin a unit of work and return the associated {@link Transaction} object.
 	 * If a new underlying transaction is required, begin the transaction. Otherwise,
 	 * continue the new work in the context of the existing underlying transaction.
+	 * <p>
+	 * The JPA-standard way to begin a new transaction is by calling
+	 * {@link #getTransaction getTransaction().begin()}. When
+	 * {@linkplain org.hibernate.jpa.spi.JpaCompliance#isJpaTransactionComplianceEnabled
+	 * strict JPA transaction compliance} is enabled via, for example, setting
+	 * {@value org.hibernate.cfg.JpaComplianceSettings#JPA_TRANSACTION_COMPLIANCE},
+	 * or when resource-local transactions are used, the call to {@code begin()}
+	 * fails if the transaction is already {@linkplain Transaction#isActive active}.
+	 * On the other hand, this method does not fail when a transaction is already
+	 * active, and simply returns the {@link Transaction} object representing the
+	 * active transaction.
 	 *
 	 * @return an instance of {@link Transaction} representing the new transaction
 	 *

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -606,9 +606,13 @@ public CacheTransactionSynchronization getCacheTransactionSynchronization() {
 	@Override
 	public Transaction beginTransaction() {
 		checkOpen();
-		final Transaction result = getTransaction();
-		result.begin();
-		return result;
+		final Transaction transaction = getTransaction();
+		// only need to begin a transaction if it was not
+		// already active (this is the documented semantics)
+		if ( !transaction.isActive() ) {
+			transaction.begin();
+		}
+		return transaction;
 	}
 
 	protected void checkTransactionSynchStatus() {

hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java

@@ -45,7 +45,8 @@ public void anIllegalStateExceptionShouldBeThrownWhenBeginTxIsCalledWithAnAlread
 			Transaction tx = null;
 			try {
 				// A call to begin() with an active Tx should cause an IllegalStateException
-				tx = s.beginTransaction();
+				tx = s.getTransaction();
+				tx.begin();
 			}
 			catch (Exception e) {
 				if ( tx != null && tx.isActive() ) {

hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java

@@ -50,7 +50,8 @@ public void setUp() {
 	public void noIllegalStateExceptionShouldBeThrownWhenBeginTxIsCalledWithAnAlreadyActiveTx() throws Exception {
 		tm.begin();
 		try (Session s = openSession()) {
-			Transaction tx = s.beginTransaction();
+			Transaction tx = s.getTransaction();
+			tx.begin();
 			try {
 				s.persist( new TestEntity( "ABC" ) );
 				tx.commit();