From 0d6cc122744df002e35f0788eab28bbd492c46ed Mon Sep 17 00:00:00 2001 From: Koy Date: Thu, 16 Sep 2021 16:13:29 +0800 Subject: [PATCH] Fix collectionToDelimitedString failure for null elements. Prior to this commit, calling `StringUtils#collectionToDelimitedString` would fail with an NPE if the collection contains null elements. This commit ensures that null elements are converted as `"null"` in the resulting String without failure. See gh-27419 --- .../src/main/java/org/springframework/util/StringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index 80a996d481..269257fd60 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -1301,7 +1301,7 @@ public abstract class StringUtils { int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length(); for (Object element : coll) { - totalLength += element.toString().length(); + totalLength += String.valueOf(element).length(); } StringBuilder sb = new StringBuilder(totalLength);