From 5c2a48fee4e84c4a6fde944a696090f22d3150e0 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 30 Aug 2023 21:35:16 +0800 Subject: [PATCH] fix NPE --- .../java/org/dromara/hutool/core/text/CharSequenceUtil.java | 2 +- .../test/java/org/dromara/hutool/core/text/StrUtilTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java index 16ffe0862..0c0d3d291 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java @@ -698,7 +698,7 @@ public class CharSequenceUtil extends StrValidator { return null; } for (final CharSequence checkStr : testStrs) { - if (str.toString().contains(checkStr)) { + if (contains(str, checkStr)) { return checkStr.toString(); } } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java index 3f09b48f8..686687ee6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java @@ -371,6 +371,10 @@ public class StrUtilTest { Assertions.assertFalse(containsAny); containsAny = StrUtil.containsAny("aaabbbccc", "d", "c"); Assertions.assertTrue(containsAny); + + // https://gitee.com/dromara/hutool/issues/I7WSYD + containsAny = StrUtil.containsAny("你好啊", "嗯", null); + Assertions.assertFalse(containsAny); } @Test