Fix an AllEncompassingFormHttpMessageConverter regression

sdeleuze · sdeleuze · commit 2f0970b18401 · 2020-06-20T17:05:13.000+02:00
Restore previous behavior to configure Jaxb2RootElementHttpMessageConverter when JAXB but not Jackson are present. Closes gh-25291
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -78,7 +78,7 @@ public AllEncompassingFormHttpMessageConverter() {
 				// Ignore when no TransformerFactory implementation is available
 			}
 
-			if (jaxb2Present) {
+			if (jaxb2Present && !jackson2XmlPresent) {
 				addPartConverter(new Jaxb2RootElementHttpMessageConverter());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public AllEncompassingFormHttpMessageConverter() {`
`78`	`78`	`// Ignore when no TransformerFactory implementation is available`
`79`	`79`	`}`
`80`	`80`
`81`		`- if (jaxb2Present) {`
	`81`	`+ if (jaxb2Present && !jackson2XmlPresent) {`
`82`	`82`	`addPartConverter(new Jaxb2RootElementHttpMessageConverter());`
`83`	`83`	`}`
`84`	`84`	`}`