root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix an AllEncompassingFormHttpMessageConverter regression 

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

Closes gh-25291
This commit is contained in:
Sébastien Deleuze 2020-06-20 16:40:28 +02:00
parent 63dff520e6
commit 2f0970b184
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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