github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 16:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to 12.11.4

Browse Source
This commit is contained in:
rbygrave
2021-09-09 13:10:13 +12:00
parent 56cb2c69aa
commit 30f3d542b3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+2 -2
View File
@@ -39,14 +39,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>12.11.1</version>
<version>12.11.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.11.1</version>
<version>12.11.4A</version>
<scope>test</scope>
</dependency>
src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
+2 -2
View File
@@ -52,7 +52,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
// RB: At this stage not exposing TransactionManager to
// the public API and hence the Object type and casting here
this.transactionManager = (TransactionManager) txnMgr;
this.dataSource = transactionManager.getDataSource();
this.dataSource = transactionManager.dataSource();
}
/**
@@ -67,7 +67,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource);
if (holder == null || !holder.isSynchronizedWithTransaction()) {
// no current Spring transaction
SpiTransaction currentEbeanTransaction = transactionManager.getInScope();
SpiTransaction currentEbeanTransaction = transactionManager.inScope();
if (currentEbeanTransaction == null || !currentEbeanTransaction.isActive()) {
return null;
} else {