Merge branch '6.0.x'

2023-11-15 18:57:35 +00:00
parent f15b8b95ad 05c3ffb2fb
commit 3a70c71c5e
4 changed files with 109 additions and 61 deletions
--- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
@@ -362,7 +362,9 @@ public abstract class MimeTypeUtils {
 	 */
 	public static <T extends MimeType> void sortBySpecificity(List<T> mimeTypes) {
 		Assert.notNull(mimeTypes, "'mimeTypes' must not be null");
-		Assert.isTrue(mimeTypes.size() <= 50, "Too many elements");
+		if (mimeTypes.size() >= 50) {
+			throw new InvalidMimeTypeException(mimeTypes.toString(), "Too many elements");
+		}

 		bubbleSort(mimeTypes, MimeType::isLessSpecific);
 	}