Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-29176
This commit is contained in:
Stephane Nicoll
2021-12-27 12:02:57 +01:00
parent eb81cbf053 576eb50ed8
commit 2b140950e3
10 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
View File

@@ -234,7 +234,7 @@ public class TestEntityManager {
*/
public final EntityManager getEntityManager() {
EntityManager manager = EntityManagerFactoryUtils.getTransactionalEntityManager(this.entityManagerFactory);
Assert.state(manager != null, "No transactional EntityManager found, is your test running in a transactional?");
Assert.state(manager != null, "No transactional EntityManager found, is your test running in a transaction?");
return manager;
}