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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
This commit is contained in:
Sam Brannen
2022-07-12 12:42:49 +02:00
parent 3f993f8639 3b68e97710
commit 49b47cc6cf
21 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
View File

@@ -214,7 +214,7 @@ public class JndiJtaTransactionManagerTests {
}
/**
* Prevent any side-effects due to this test modifying ThreadLocals that might
* Prevent any side effects due to this test modifying ThreadLocals that might
* affect subsequent tests when all tests are run in the same JVM, as with Eclipse.
*/
@AfterEach

2
spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
View File

@@ -1184,7 +1184,7 @@ public class JtaTransactionManagerTests {
/**
* Prevent any side-effects due to this test modifying ThreadLocals that might
* Prevent any side effects due to this test modifying ThreadLocals that might
* affect subsequent tests when all tests are run in the same JVM, as with Eclipse.
*/
@AfterEach