From 1a8629d40825c073b6863ae2ab748b647b28506a Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Mon, 3 Feb 2014 21:44:13 -0500
Subject: [PATCH] Fix failing test

---
 .../converter/xml/Jaxb2CollectionHttpMessageConverter.java     | 2 +-
 .../xml/Jaxb2CollectionHttpMessageConverterTests.java          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
index e4a540e584..81fb9373e3 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
@@ -229,7 +229,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
 	 */
 	protected XMLInputFactory createXmlInputFactory() {
 		XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-		inputFactory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
+		inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
 		return inputFactory;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index 344362036e..ef56a13aa5 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -126,7 +126,7 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void readXmlRootElementWithExternalEntity() throws Exception {
+	public void readXmlRootElementExternalEntityDisabled() throws Exception {
 
 		Resource external = new ClassPathResource("external.txt", getClass());
 		String content =  "<!DOCTYPE root [" +
@@ -151,7 +151,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 				"  <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
 
-		// Now read with
 		Jaxb2CollectionHttpMessageConverter<?> c = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
 			@Override
 			protected XMLInputFactory createXmlInputFactory() {