Repository: struts Updated Branches: refs/heads/master 4cd9a74cb -> c9efe4d0e
Uniform comparison Add more defense, like compare Enum to String or else. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b3e8da2e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b3e8da2e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b3e8da2e Branch: refs/heads/master Commit: b3e8da2ec8ac8cc872b95979041cb32d6494a1a6 Parents: 4286d6a Author: zhouyanming <zhouyanm...@gmail.com> Authored: Wed Sep 9 18:20:45 2015 +0800 Committer: zhouyanming <zhouyanm...@gmail.com> Committed: Wed Sep 9 18:20:45 2015 +0800 ---------------------------------------------------------------------- core/src/main/java/org/apache/struts2/util/ContainUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b3e8da2e/core/src/main/java/org/apache/struts2/util/ContainUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/util/ContainUtil.java b/core/src/main/java/org/apache/struts2/util/ContainUtil.java index f3cd324..af19603 100644 --- a/core/src/main/java/org/apache/struts2/util/ContainUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ContainUtil.java @@ -77,7 +77,7 @@ public class ContainUtil { } } if (obj1 instanceof Iterable) { for (Object value : ((Iterable) obj1)) { - if (obj2.equals(value) || obj2.toString().equals(value)) { + if (obj2.equals(value) || obj2.toString().equals(value.toString())) { return true; } } @@ -85,7 +85,7 @@ public class ContainUtil { for (int i = 0; i < Array.getLength(obj1); i++) { Object value = Array.get(obj1, i); - if (obj2.equals(value)) { + if (obj2.equals(value) || obj2.toString().equals(value.toString())) { return true; } }
