From b286f3743d67812704c975509fdd7a352baa912a Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Tue, 10 Aug 2021 21:38:34 +0800
Subject: [PATCH] add null check

---
 .../src/main/java/cn/hutool/core/bean/BeanUtil.java        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java
index 33ffde3f6..ba44b21bd 100644
--- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java
@@ -23,6 +23,7 @@ import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -724,6 +725,12 @@ public class BeanUtil {
 	 * @since 5.6.4
 	 */
 	public static <T> List<T> copyToList(Collection<?> collection, Class<T> targetType, CopyOptions copyOptions){
+		if(null == collection){
+			return null;
+		}
+		if(collection.isEmpty()){
+			return new ArrayList<>(0);
+		}
 		return collection.stream().map((source)->{
 			final T target = ReflectUtil.newInstanceIfPossible(targetType);
 			copyProperties(source, target, copyOptions);