diff --git a/CHANGELOG.md b/CHANGELOG.md index fc495b155..ef7fba7b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ * 【json 】 修复JSONConvert转换日期空指针问题(issue#I1F8M2@Gitee) * 【core 】 修复XML中带注释Xpath解析导致空指针问题(issue#I1F2WI@Gitee) * 【core 】 修复FileUtil.rename原文件无扩展名多点的问题(issue#839@Github) +* 【db 】 修复DbUtil.close可能存在的空指针问题(issue#847@Github) ------------------------------------------------------------------------------------------------------------- ## 5.3.1 (2020-04-17) diff --git a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java index e01ac8b44..1de03ef36 100644 --- a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java @@ -152,10 +152,12 @@ public final class DbUtil { */ public static void close(Object... objsToClose) { for (Object obj : objsToClose) { - if (obj instanceof AutoCloseable) { - IoUtil.close((AutoCloseable) obj); - } else { - log.warn("Object {} not a ResultSet or Statement or PreparedStatement or Connection!", obj.getClass().getName()); + if(null != obj){ + if (obj instanceof AutoCloseable) { + IoUtil.close((AutoCloseable) obj); + } else { + log.warn("Object {} not a ResultSet or Statement or PreparedStatement or Connection!", obj.getClass().getName()); + } } } }