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

HHH-13936 Call pulseTransactionCoordinator before checking for transaction in flush() 

(cherry picked from commit 585ca8e2bf)
This commit is contained in:
michiel.hendriks 2020-04-07 12:12:54 +02:00 committed by Sanne Grinovero
parent 9b2a960c40
commit 7b7ef154d1
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -1459,8 +1459,8 @@ public final class SessionImpl
}
private void doFlush() {
checkTransactionNeededForUpdateOperation();
pulseTransactionCoordinator();
checkTransactionNeededForUpdateOperation();
try {
if ( persistenceContext.getCascadeLevel() > 0 ) {

68
hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushJoinTransaction.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.flush;
import java.util.Map;
import javax.persistence.TransactionRequiredException;
import org.hibernate.Session;
import org.hibernate.cfg.AvailableSettings;
import org.junit.Assert;
import org.junit.Test;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.jta.TestingJtaBootstrap;
import org.hibernate.testing.jta.TestingJtaPlatformImpl;
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
/**
* @author Michiel Hendriks
*/
@TestForIssue(jiraKey = "HHH-13936")
public class TestFlushJoinTransaction extends BaseNonConfigCoreFunctionalTestCase {
@Override
protected void addSettings(Map settings) {
super.addSettings( settings );
TestingJtaBootstrap.prepare( settings );
settings.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta" );
}
@Test
public void testFlush() throws Exception {
Session session = openSession();
try {
TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
session.flush();
TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit();
}
catch (TransactionRequiredException e) {
Assert.fail("No TransactionRequiredException expected.");
}
finally {
session.close();
}
}
@Test
public void testIsConnectedFlush() throws Exception {
Session session = openSession();
try {
TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
session.isConnected();
session.flush();
TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit();
}
catch (TransactionRequiredException e) {
Assert.fail("No TransactionRequiredException expected.");
}
finally {
session.close();
}
}
}