From 8a4ffd21abb3624da55a923f99b9c2f8266e385b Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 14 Jun 2019 16:38:58 +1200 Subject: [PATCH] #1722 - Fix for - L2 cache throw exception when query with custom ManyToMany relation model --- .../server/deploy/id/IdBinderEmbedded.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 6358a57c3..f1a93dfbb 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -346,19 +346,20 @@ public final class IdBinderEmbedded implements IdBinder { public Object read(DbReadContext ctx) throws SQLException { EntityBean embId = idDesc.createEntityBean(); - boolean notNull = true; + boolean nullValue = true; for (BeanProperty prop : props) { - Object value = prop.readSet(ctx, embId); - if (value == null) { - notNull = false; + Object value = prop.read(ctx); + if (value != null) { + prop.setValue(embId, value); + nullValue = false; } } - if (notNull) { - return embId; - } else { + if (nullValue) { return null; + } else { + return embId; } }