root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

DataSourceTransactionManager resets ConnectionHolder on doBegin failure 

Issue: SPR-12280
This commit is contained in:
Juergen Hoeller 2014-10-02 14:33:21 +02:00
parent 05c995cfb3
commit fd69ee541e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
View File

@ -179,7 +179,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
DataSourceTransactionObject txObject = new DataSourceTransactionObject(); DataSourceTransactionObject txObject = new DataSourceTransactionObject();
txObject.setSavepointAllowed(isNestedTransactionAllowed()); txObject.setSavepointAllowed(isNestedTransactionAllowed());
ConnectionHolder conHolder = ConnectionHolder conHolder =
(ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource); (ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource);
txObject.setConnectionHolder(conHolder, false); txObject.setConnectionHolder(conHolder, false);
return txObject; return txObject;
} }
@ -238,7 +238,10 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
} }
catch (Throwable ex) { catch (Throwable ex) {
DataSourceUtils.releaseConnection(con, this.dataSource); if (txObject.isNewConnectionHolder()) {
DataSourceUtils.releaseConnection(con, this.dataSource);
txObject.setConnectionHolder(null, false);
}
throw new CannotCreateTransactionException("Could not open JDBC Connection for transaction", ex); throw new CannotCreateTransactionException("Could not open JDBC Connection for transaction", ex);
} }
} }