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

Only attempt to call joinTransaction in case of actual transaction active

Browse Source 
Issue: SPR-13242
This commit is contained in:
Juergen Hoeller
2015-07-17 15:24:52 +02:00
parent a8fb551b1c
commit 2f8ac91872
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -722,7 +722,6 @@ public class JpaTransactionManagerTests {
TransactionSynchronizationManager.unbindResource(factory);
}
verify(manager).joinTransaction();
verify(manager).flush();
}
@@ -754,7 +753,6 @@ public class JpaTransactionManagerTests {
TransactionSynchronizationManager.unbindResource(factory);
}
verify(manager).joinTransaction();
verify(manager).flush();
verify(manager).clear();
}