From 564194042b4a4a77d92c145ff2fd567bfc9b9366 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Feb 2023 23:44:13 +1300 Subject: [PATCH] No effective change, BeanCollectionUtil perform the instanceof Collection before instanceof Map check --- .../ebeaninternal/server/deploy/BeanCollectionUtil.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index aa8c72b5a..b75e305e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -38,13 +38,10 @@ public final class BeanCollectionUtil { // returns a collection of beans return bc.getActualEntries(); } - - if (o instanceof Map) { - // yes, we want the entrySet (to set the keys) - return ((Map) o).entrySet(); - - } else if (o instanceof Collection) { + if (o instanceof Collection) { return ((Collection) o); + } else if (o instanceof Map) { + return ((Map) o).entrySet(); } throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName()); }