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

Clear synchronization before triggering afterCompletion callbacks

Browse Source 
Issue: SPR-15194
Issue: SPR-11590
This commit is contained in:
Juergen Hoeller
2017-02-10 10:39:33 +01:00
parent 5015613934
commit b630c9bea7
3 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
View File

@@ -45,6 +45,7 @@ import org.springframework.transaction.UnexpectedRollbackException;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -57,19 +58,19 @@ import static org.mockito.BDDMockito.*;
*/
public class DataSourceTransactionManagerTests {
private Connection con;
private DataSource ds;
private Connection con;
private DataSourceTransactionManager tm;
@Before
public void setUp() throws Exception {
con = mock(Connection.class);
ds = mock(DataSource.class);
tm = new DataSourceTransactionManager(ds);
con = mock(Connection.class);
given(ds.getConnection()).willReturn(con);
tm = new DataSourceTransactionManager(ds);
}
@After
@@ -455,13 +456,16 @@ public class DataSourceTransactionManagerTests {
final TestTransactionSynchronization synch =
new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) {
@Override
public void afterCompletion(int status) {
super.afterCompletion(status);
protected void doAfterCompletion(int status) {
super.doAfterCompletion(status);
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
protected void doInTransactionWithoutResult(TransactionStatus status) {
}
});
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronizationAdapter() {
});
}
};
@@ -477,10 +481,50 @@ public class DataSourceTransactionManagerTests {
assertTrue(synch.beforeCompletionCalled);
assertTrue(synch.afterCommitCalled);
assertTrue(synch.afterCompletionCalled);
assertTrue(synch.afterCompletionException instanceof IllegalStateException);
verify(con, times(2)).commit();
verify(con, times(2)).close();
}
@Test
public void testParticipatingTransactionWithDifferentConnectionObtainedFromSynch() throws Exception {
DataSource ds2 = mock(DataSource.class);
final Connection con2 = mock(Connection.class);
given(ds2.getConnection()).willReturn(con2);
assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
final TransactionTemplate tt = new TransactionTemplate(tm);
final TestTransactionSynchronization synch =
new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) {
@Override
protected void doAfterCompletion(int status) {
super.doAfterCompletion(status);
Connection con = DataSourceUtils.getConnection(ds2);
DataSourceUtils.releaseConnection(con, ds2);
}
};
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
TransactionSynchronizationManager.registerSynchronization(synch);
}
});
assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
assertTrue(synch.beforeCommitCalled);
assertTrue(synch.beforeCompletionCalled);
assertTrue(synch.afterCommitCalled);
assertTrue(synch.afterCompletionCalled);
assertNull(synch.afterCompletionException);
verify(con).commit();
verify(con).close();
verify(con2).close();
}
@Test
public void testParticipatingTransactionWithRollbackOnlyAndInnerSynch() throws Exception {
tm.setTransactionSynchronization(DataSourceTransactionManager.SYNCHRONIZATION_NEVER);
@@ -1447,6 +1491,8 @@ public class DataSourceTransactionManagerTests {
public boolean afterCompletionCalled;
public Throwable afterCompletionException;
public TestTransactionSynchronization(DataSource dataSource, int status) {
this.dataSource = dataSource;
this.status = status;
@@ -1490,6 +1536,15 @@ public class DataSourceTransactionManagerTests {
@Override
public void afterCompletion(int status) {
try {
doAfterCompletion(status);
}
catch (Throwable ex) {
this.afterCompletionException = ex;
}
}
protected void doAfterCompletion(int status) {
assertFalse(this.afterCompletionCalled);
this.afterCompletionCalled = true;
assertTrue(status == this.status);