Merge branch '5.1.x'

rstoyanchev · rstoyanchev · commit 2eba010c1b2f · 2019-07-13T11:00:57.000+01:00
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
@@ -91,6 +91,10 @@ public Jaxb2XmlDecoder() {
 		super(MimeTypeUtils.APPLICATION_XML, MimeTypeUtils.TEXT_XML);
 	}
 
+	public Jaxb2XmlDecoder(MimeType... supportedMimeTypes) {
+		super(supportedMimeTypes);
+	}
+
 
 	/**
 	 * Configure a processor function to customize Unmarshaller instances.

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,10 @@ public Jaxb2XmlDecoder() {`
`91`	`91`	`super(MimeTypeUtils.APPLICATION_XML, MimeTypeUtils.TEXT_XML);`
`92`	`92`	`}`
`93`	`93`
	`94`	`+ public Jaxb2XmlDecoder(MimeType... supportedMimeTypes) {`
	`95`	`+ super(supportedMimeTypes);`
	`96`	`+ }`
	`97`	`+`
`94`	`98`
`95`	`99`	`/**`
`96`	`100`	`* Configure a processor function to customize Unmarshaller instances.`