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(); } }