fix null check

zxc93 · Dec 6, 2018 · ad95ce2 · ad95ce2
1 parent daeb6fe
commit ad95ce2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### 新特性
 * 【core】        增加TypeReference类（issue#IPAML@Gitee）
 * 【json】         支持TypeReference类转换，并对toBean逻辑做了大量变动（issue#IPAML@Gitee）
+* 【core】        ArrayUtil.get和CollUtil.get返回null而非空指针（issue#IPKZO@Gitee）
 
 ### Bug修复
 

diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1773,6 +1773,10 @@ public static <T> List<T> addAllIfNotContains(List<T> list, List<T> otherList) {
 	 * @since 4.0.6
 	 */
 	public static <T> T get(Collection<T> collection, int index) {
+		if(null == collection) {
+			return null;
+		}
+
 		final int size = collection.size();
 		if (index < 0) {
 			index += size;

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
@@ -1808,6 +1808,10 @@ public static boolean isArray(Object obj) {
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T get(Object array, int index) {
+		if(null == array) {
+			return null;
+		}
+
 		if (index < 0) {
 			index += Array.getLength(array);
 		}