killbill-aplcache

Merge remote-tracking branch 'origin/work-for-release-0.19.x'

3/5/2018 10:36:14 PM

Details

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index a58d560..e968485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.141.38</version>
+        <version>0.141.40</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.19.5-SNAPSHOT</version>
diff --git a/util/src/main/java/org/killbill/billing/util/entity/dao/EntitySqlDaoTransactionalJdbiWrapper.java b/util/src/main/java/org/killbill/billing/util/entity/dao/EntitySqlDaoTransactionalJdbiWrapper.java
index 0366e3a..5215534 100644
--- a/util/src/main/java/org/killbill/billing/util/entity/dao/EntitySqlDaoTransactionalJdbiWrapper.java
+++ b/util/src/main/java/org/killbill/billing/util/entity/dao/EntitySqlDaoTransactionalJdbiWrapper.java
@@ -84,7 +84,10 @@ public class EntitySqlDaoTransactionalJdbiWrapper {
         final Handle handle = dbi.open();
         try {
             final EntitySqlDao<EntityModelDao<Entity>, Entity> entitySqlDao = handle.attach(InitialEntitySqlDao.class);
-            return entitySqlDao.inTransaction(TransactionIsolationLevel.READ_COMMITTED, new JdbiTransaction<ReturnType, EntityModelDao<Entity>, Entity>(handle, entitySqlDaoTransactionWrapper));
+            // The transaction isolation level is now set at the pool level: this avoids 3 roundtrips for each transaction
+            // Note that if the pool isn't used (tests or PostgreSQL), the transaction level will depend on the DB configuration
+            //return entitySqlDao.inTransaction(TransactionIsolationLevel.READ_COMMITTED, new JdbiTransaction<ReturnType, EntityModelDao<Entity>, Entity>(handle, entitySqlDaoTransactionWrapper));
+            return entitySqlDao.inTransaction(new JdbiTransaction<ReturnType, EntityModelDao<Entity>, Entity>(handle, entitySqlDaoTransactionWrapper));
         } finally {
             handle.close();
         }