From 2f0970b18401426846b38388927f182b3327bb98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Sat, 20 Jun 2020 16:40:28 +0200
Subject: [PATCH] Fix an AllEncompassingFormHttpMessageConverter regression

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

Closes gh-25291
---
 .../support/AllEncompassingFormHttpMessageConverter.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index d747800c46..e626804d76 100644
--- 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 class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 				// Ignore when no TransformerFactory implementation is available
 			}
 
-			if (jaxb2Present) {
+			if (jaxb2Present && !jackson2XmlPresent) {
 				addPartConverter(new Jaxb2RootElementHttpMessageConverter());
 			}
 		}