github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1918 - Ebean 12.1.9 breaks Guice in Stage.PRODUCTION mode for multi tenant apps

Browse Source
This commit is contained in:
rob bygrave
2020-01-28 12:07:07 +13:00
parent df63eeaa8c
commit acff330b37
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+5 -5
View File
@@ -8,11 +8,11 @@ import io.ebeaninternal.api.QueryPlanManager;
import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryBindCapture;
import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.transaction.TransactionManager;
import io.ebeaninternal.server.type.bindcapture.BindCapture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@@ -28,7 +28,7 @@ public class CQueryPlanManager implements QueryPlanManager {
private final ConcurrentHashMap<CQueryBindCapture, Object> plans = new ConcurrentHashMap<>();
private final DataSource dataSource;
private final TransactionManager transactionManager;
private final long defaultThreshold;
@@ -38,8 +38,8 @@ public class CQueryPlanManager implements QueryPlanManager {
private final TimedMetric timeBindCapture;
public CQueryPlanManager(DataSource dataSource, long defaultThreshold, QueryPlanLogger planLogger, ExtraMetrics extraMetrics) {
this.dataSource = dataSource;
public CQueryPlanManager(TransactionManager transactionManager, long defaultThreshold, QueryPlanLogger planLogger, ExtraMetrics extraMetrics) {
this.transactionManager = transactionManager;
this.defaultThreshold = defaultThreshold;
this.planLogger = planLogger;
this.timeCollection = extraMetrics.getPlanCollect();
@@ -65,7 +65,7 @@ public class CQueryPlanManager implements QueryPlanManager {
}
private List<MetaQueryPlan> collectPlans(QueryPlanRequest request) {
try (Connection connection = dataSource.getConnection()) {
try (Connection connection = transactionManager.getQueryPlanConnection()) {
CQueryPlanRequest req = new CQueryPlanRequest(connection, request, plans.keySet().iterator());
while (req.hasNext()) {
req.nextCapture();