root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Brian Clozel 2021-09-17 15:30:16 +02:00
parent 5eac8555d9 a50537fbaf
commit cce61c3918
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

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

6
spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
View File

@ -17,6 +17,7 @@
package org.springframework.util;
import java.util.Arrays;
import java.util.Collections;
import java.util.Locale;
import java.util.Properties;
@ -777,4 +778,9 @@ class StringUtilsTests {
assertThat(StringUtils.split(null, null)).isNull();
}
@Test
void collectionToDelimitedStringWithNullValuesShouldNotFail() {
assertThat(StringUtils.collectionToCommaDelimitedString(Collections.singletonList(null))).isEqualTo("null");
}
}