fix(CharSequenceUtil): 新增判空

- 前置判空,方式s.toString导致的NPE
This commit is contained in:
groundhog 2023-08-29 15:28:26 +08:00
parent 6656bb6eac
commit 1792c495d1
2 changed files with 5 additions and 1 deletions

View File

@ -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();
}
}

View File

@ -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