Allow JAXB to be registered next to plain Jackson

Issue: SPR-14336 (cherry picked from commit abcfffd)
spring-projects · Jun 7, 2016 · d0b2fe5 · d0b2fe5
1 parent e9ba64a
commit d0b2fe5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...a/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/...a/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 	public AllEncompassingFormHttpMessageConverter() {
 		addPartConverter(new SourceHttpMessageConverter<Source>());
 
-		if (jaxb2Present && !jackson2Present) {
+		if (jaxb2Present && !jackson2XmlPresent) {
 			addPartConverter(new Jaxb2RootElementHttpMessageConverter());
 		}