Merge branch '5.1.x'

spring-web/src/test/java/org/springframework/http/MediaTypeTests.java

@@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.within;
 /**
  * @author Arjen Poutsma
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
 public class MediaTypeTests {
 
@@ -159,6 +160,13 @@ public class MediaTypeTests {
 		assertThat(mediaTypes.size()).as("Invalid amount of media types").isEqualTo(0);
 	}
 
+	@Test // gh-23241
+	public void parseMediaTypesWithTrailingComma() {
+		List<MediaType> mediaTypes = MediaType.parseMediaTypes("text/plain, text/html, ");
+		assertThat(mediaTypes).as("No media types returned").isNotNull();
+		assertThat(mediaTypes.size()).as("Incorrect number of media types").isEqualTo(2);
+	}
+
 	@Test
 	public void compareTo() {
 		MediaType audioBasic = new MediaType("audio", "basic");