ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix pr#1694

Browse Source
This commit is contained in:
Looly 2021-07-06 02:47:54 +08:00
parent 795b3f71ea
commit ead5e1c13a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复RadixUtil.decode非static问题（issue#I3YPEH@Gitee） * 【core 】 修复RadixUtil.decode非static问题（issue#I3YPEH@Gitee）
* 【core 】 修复EqualsBuilder数组判断问题（pr#1694@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

25
hutool-core/src/main/java/cn/hutool/core/builder/EqualsBuilder.java
View File

@ -39,7 +39,7 @@ import java.util.Set;
* return EqualsBuilder.reflectionEquals(this, obj); * return EqualsBuilder.reflectionEquals(this, obj);
* } * }
* </pre> * </pre>
* * <p>
* 来自Apache Commons Lang改造 * 来自Apache Commons Lang改造
*/ */
public class EqualsBuilder implements Builder<Boolean> { public class EqualsBuilder implements Builder<Boolean> {
@ -241,7 +241,7 @@ public class EqualsBuilder implements Builder<Boolean> {
* @since 2.0 * @since 2.0
*/ */
public static boolean reflectionEquals(final Object lhs, final Object rhs, final boolean testTransients, final Class<?> reflectUpToClass, public static boolean reflectionEquals(final Object lhs, final Object rhs, final boolean testTransients, final Class<?> reflectUpToClass,
final String... excludeFields) { final String... excludeFields) {
if (lhs == rhs) { if (lhs == rhs) {
return true; return true;
} }
@ -375,19 +375,15 @@ public class EqualsBuilder implements Builder<Boolean> {
return this; return this;
} }
if (lhs == null || rhs == null) { if (lhs == null || rhs == null) {
this.setEquals(false); return setEquals(false);
return this;
} }
final Class<?> lhsClass = lhs.getClass(); if (ArrayUtil.isArray(lhs)) {
if (false == lhsClass.isArray()) { // 判断数组的equals
// The simple case, not an array, just test the element return setEquals(ArrayUtil.equals(lhs, rhs));
this.setEquals(lhs.equals(rhs));
return this;
} }
// 判断数组的equals // The simple case, not an array, just test the element
this.setEquals(ArrayUtil.equals(lhs, rhs)); return setEquals(lhs.equals(rhs));
return this;
} }
/** /**
@ -549,10 +545,11 @@ public class EqualsBuilder implements Builder<Boolean> {
* Sets the <code>isEquals</code> value. * Sets the <code>isEquals</code> value.
* *
* @param isEquals The value to set. * @param isEquals The value to set.
* @since 2.1 * @return this
*/ */
protected void setEquals(boolean isEquals) { protected EqualsBuilder setEquals(boolean isEquals) {
this.isEquals = isEquals; this.isEquals = isEquals;
return this;
} }
/** /**