From 1082170d0245ab85df05ce5ff2c76837bcaa0ce6 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 25 Jun 2020 12:49:26 +0200 Subject: [PATCH] [Fix] Fixed ObjectHelper.isIn() with Collection, Array --- .../java/li/strolch/utils/ObjectHelper.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java b/li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java index 9639b15fd..b8dee563f 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java @@ -222,26 +222,38 @@ public class ObjectHelper { return false; if (right instanceof Collection) { + Collection collectionRight = (Collection) right; + if (left instanceof Collection) { - Collection collectionRight = (Collection) right; - Collection collectionleft = (Collection) left; - for (Object oLeft : collectionleft) { - for (Object oRight : collectionRight) { - if (equals(oRight, oLeft, ignoreCase)) + Collection collectionLeft = (Collection) left; + for (Object l : collectionLeft) { + for (Object r : collectionRight) { + if (equals(r, l, ignoreCase)) return true; } } + return false; + + } else if (left instanceof String[]) { + String[] leftArr = (String[]) left; + for (Object r : collectionRight) { + for (Object l : leftArr) { + if (equals(r, l, ignoreCase)) + return true; + } + } + + return false; + } else { - Collection collection = (Collection) right; - for (Object o : collection) { + for (Object o : collectionRight) { if (equals(o, left, ignoreCase)) return true; } return false; } - } if (right instanceof Object[]) {