Browse Source

Fix an AllEncompassingFormHttpMessageConverter regression

Restore previous behavior to configure
Jaxb2RootElementHttpMessageConverter when JAXB but not Jackson are present.

Closes gh-25291
pull/25297/head
Sébastien Deleuze 6 years ago
parent
commit
2f0970b184
  1. 2
      spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

2
spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

@ -78,7 +78,7 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv @@ -78,7 +78,7 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
// Ignore when no TransformerFactory implementation is available
}
if (jaxb2Present) {
if (jaxb2Present && !jackson2XmlPresent) {
addPartConverter(new Jaxb2RootElementHttpMessageConverter());
}
}

Loading…
Cancel
Save