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

Merge pull request #2969 from LuisStruggle/v6-dev-3

Browse Source 
fix：ArrayUtil.addAll()方法，判断空数据组优化
This commit is contained in:
Golden Looly 2023-03-10 22:12:08 +08:00 committed by GitHub
commit 9f18f16e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
View File

@ -588,15 +588,19 @@ public class ArrayUtil extends PrimitiveArrayUtil {
int length = 0; int length = 0;
for (final T[] array : arrays) { for (final T[] array : arrays) {
if (null != array) { if (isNotEmpty(array)) {
length += array.length; length += array.length;
} }
} }
final T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length); final T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length);
if (length == 0) {
return result;
}
length = 0; length = 0;
for (final T[] array : arrays) { for (final T[] array : arrays) {
if (null != array) { if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length); System.arraycopy(array, 0, result, length, array.length);
length += array.length; length += array.length;
} }