From 84448ffd8429656708374ffc4bff3a866ec141c3 Mon Sep 17 00:00:00 2001
From: LuisStruggle <18300767078@163.com>
Date: Fri, 10 Mar 2023 13:43:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AArrayUtil.addAll()=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=88=A4=E6=96=AD=E7=A9=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/util/ArrayUtil.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
index c7a152e22..6c572a5ee 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
@@ -588,15 +588,19 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 
 		int length = 0;
 		for (final T[] array : arrays) {
-			if (null != array) {
+			if (isNotEmpty(array)) {
 				length += array.length;
 			}
 		}
+
 		final T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length);
+		if (length == 0) {
+			return result;
+		}
 
 		length = 0;
 		for (final T[] array : arrays) {
-			if (null != array) {
+			if (isNotEmpty(array)) {
 				System.arraycopy(array, 0, result, length, array.length);
 				length += array.length;
 			}