#535 - Bean lazy loading can execute an extra query when one of the lazy loaded beans has been deleted

This commit is contained in:
Robin Bygrave committed 2016-01-21 20:51:32 +13:00
1 parent 64618da6a7
commit 6ab974a330
5 files changed
+55 -24

No files matched your search

@@ -85,7 +85,7 @@ public class DefaultBeanLoader {
SpiQuery<?> query = loadRequest.createQuery(server, batchSize);
executeLazyLoadQuery(loadRequest, query);
executeQuery(loadRequest, query);
loadRequest.postLoad();
@@ -214,7 +214,7 @@ public class DefaultBeanLoader {
query.where().idIn(idList);
}
List<?> list = executeLazyLoadQuery(loadRequest, query);
List<?> list = executeQuery(loadRequest, query);
loadRequest.postLoad(list);
@@ -225,7 +225,7 @@ public class DefaultBeanLoader {
/**
* Execute the lazy load query taking into account MySql transaction oddness.
*/
private List<?> executeLazyLoadQuery(LoadRequest loadRequest, SpiQuery<?> query) {
private List<?> executeQuery(LoadRequest loadRequest, SpiQuery<?> query) {
if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
// MySql - we need a different transaction to execute the secondary query
SpiTransaction extraTxn = server.createQueryTransaction();
@@ -190,7 +190,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
}
}
LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache);
LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadPropertyIndex(), ebi.getLazyLoadProperty(), context.hitCache);
context.desc.getEbeanServer().loadBean(req);
}