From e344b5c0a150b462c58a49e9a06327b156391968 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 13 May 2016 14:12:28 +1200 Subject: [PATCH] #703 - Refactor - When batch lazy loading hits the L2 bean cache and misses initially, it checks that initial bean again (and should skip the second attempt) --- .../ebeaninternal/server/loadcontext/DLoadBeanContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java index fe4af3aae..09cd0419a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -185,7 +185,9 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex // check each of the beans in the batch to see if they are in the L2 cache. Iterator iterator = list.iterator(); while (iterator.hasNext()) { - if (context.desc.cacheBeanLoad(iterator.next(), persistenceContext)) { + EntityBeanIntercept batchEbi = iterator.next(); + if (batchEbi != ebi && context.desc.cacheBeanLoad(batchEbi, persistenceContext)) { + // bean successfully loaded from L2 cache so remove from batch load iterator.remove(); } }