Merge branch '5.3.x'

snicoll · snicoll · commit d1abdff89c2c · 2022-08-11T10:44:33.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -190,7 +190,8 @@ else if (ArrayList.class == collectionType || List.class == collectionType) {
 		else if (LinkedList.class == collectionType) {
 			return new LinkedList<>();
 		}
-		else if (SortedSet.class == collectionType || NavigableSet.class == collectionType) {
+		else if (TreeSet.class == collectionType || NavigableSet.class == collectionType
+				|| SortedSet.class == collectionType) {
 			return new TreeSet<>();
 		}
 		else if (EnumSet.class.isAssignableFrom(collectionType)) {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ else if (ArrayList.class == collectionType \|\| List.class == collectionType) {`
`190`	`190`	`else if (LinkedList.class == collectionType) {`
`191`	`191`	`return new LinkedList<>();`
`192`	`192`	`}`
`193`		`- else if (SortedSet.class == collectionType \|\| NavigableSet.class == collectionType) {`
	`193`	`+ else if (TreeSet.class == collectionType \|\| NavigableSet.class == collectionType`
	`194`	`+ \|\| SortedSet.class == collectionType) {`
`194`	`195`	`return new TreeSet<>();`
`195`	`196`	`}`
`196`	`197`	`else if (EnumSet.class.isAssignableFrom(collectionType)) {`