diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java index 9e1c38c9d..495fcc9e6 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java @@ -1064,7 +1064,7 @@ public class CharSequenceUtil { return null; } for (CharSequence checkStr : testStrs) { - if (str.toString().contains(checkStr)) { + if (null != checkStr && str.toString().contains(checkStr)) { return checkStr.toString(); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java index 03c4d1bae..558ae6b24 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java @@ -412,6 +412,10 @@ public class StrUtilTest { Assert.assertFalse(containsAny); containsAny = StrUtil.containsAny("aaabbbccc", "d", "c"); Assert.assertTrue(containsAny); + + // https://gitee.com/dromara/hutool/issues/I7WSYD + containsAny = StrUtil.containsAny("你好啊", "嗯", null); + Assert.assertFalse(containsAny); } @Test