Browse Source

RestTemplate accepts getMessageConverters() List on setMessageConverters again

Issue: SPR-11962
(cherry picked from commit 1222ca3)
pull/689/head
Juergen Hoeller 12 years ago
parent
commit
a45d49c857
  1. 7
      spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

7
spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

@ -201,8 +201,11 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat @@ -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);
}
}
/**

Loading…
Cancel
Save