From a45d49c8572aca6c5f49d606635897472b8fbbf9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Mon, 7 Jul 2014 14:33:48 +0200
Subject: [PATCH] RestTemplate accepts getMessageConverters() List on
 setMessageConverters again

Issue: SPR-11962
(cherry picked from commit 1222ca3)
---
 .../java/org/springframework/web/client/RestTemplate.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 1a9a7ed4b2a..60481c904b7 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -201,8 +201,11 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	 */
 	public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
 		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
-		this.messageConverters.clear();
-		this.messageConverters.addAll(messageConverters);
+		// Take getMessageConverters() List as-is when passed in here
+		if (this.messageConverters != messageConverters) {
+			this.messageConverters.clear();
+			this.messageConverters.addAll(messageConverters);
+		}
 	}
 
 	/**