ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1063 fix:StrUtil#containsAny NPE问题

Browse Source 
Merge pull request !1063 from 小怪兽说疼疼哒/v5-dev
This commit is contained in:
Looly 2023-08-30 13:35:32 +00:00 committed by Gitee
commit cc900c35d7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
View File

@ -1064,7 +1064,7 @@ public class CharSequenceUtil {
return null; return null;
} }
for (CharSequence checkStr : testStrs) { for (CharSequence checkStr : testStrs) {
if (str.toString().contains(checkStr)) { if (null != checkStr && str.toString().contains(checkStr)) {
return checkStr.toString(); return checkStr.toString();
} }
} }

4
hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
View File

@ -412,6 +412,10 @@ public class StrUtilTest {
Assert.assertFalse(containsAny); Assert.assertFalse(containsAny);
containsAny = StrUtil.containsAny("aaabbbccc", "d", "c"); containsAny = StrUtil.containsAny("aaabbbccc", "d", "c");
Assert.assertTrue(containsAny); Assert.assertTrue(containsAny);
// https://gitee.com/dromara/hutool/issues/I7WSYD
containsAny = StrUtil.containsAny("你好啊", "嗯", null);
Assert.assertFalse(containsAny);
} }
@Test @Test