From 826b507b773afd33bc3328ae0bfc83e921b80022 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Tue, 15 Mar 2022 10:36:36 +0100
Subject: [PATCH] Suggested fix

(cherry picked from commit 52ca271a13906971f0769e98c465c5cc87cb06d0)
---
 .../io/ebeaninternal/server/loadcontext/DLoadBeanContext.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 427d59de2..54c4dd84c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -190,7 +190,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
         // lazy load property was a Many
         return;
       }
-      if (list.isEmpty()) {
+      if (!list.contains(ebi)) {
         // re-add to the batch and lazy load from DB skipping l2 cache
         list.add(ebi);
       } else if (context.hitCache) {