Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4544 Merges #48 which makes ContainUtil more consistent

Browse Source
This commit is contained in:
cnenning
2015-09-22 14:39:45 +02:00
parent 4cd9a74cb8 b3e8da2ec8
commit c9efe4d0ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/util/ContainUtil.java
+2 -2
View File
@@ -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;
}
}