Merge branch '6.2.x'

2024-12-05 17:01:50 +01:00
parent c2822a6b23 e618f922c2
commit b8cdef6d29
2 changed files with 102 additions and 38 deletions
--- a/spring-core/src/test/java/org/springframework/util/PlaceholderParserTests.java
+++ b/spring-core/src/test/java/org/springframework/util/PlaceholderParserTests.java
@@ -210,6 +210,8 @@ class PlaceholderParserTests {
 		static Stream<Arguments> nestedPlaceholders() {
 			return Stream.of(
 					Arguments.of("${p6}", "v1:v2:def"),
+					Arguments.of("${p6:not-used}", "v1:v2:def"),
+					Arguments.of("${p6:${invalid}}", "v1:v2:def"),
 					Arguments.of("${invalid:${p1}:${p2}}", "v1:v2"),
 					Arguments.of("${invalid:${p3}}", "v1:v2"),
 					Arguments.of("${invalid:${p4}}", "v1:v2"),