root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove redundant check

This commit is contained in:
igor-suhorukov 2018-03-29 23:53:40 +03:00 committed by Juergen Hoeller
parent c1ff97e2a8
commit ab96bb5428
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
View File

@ -86,9 +86,7 @@ public abstract class AbstractView implements View, ApplicationContextAware {
public void setSupportedMediaTypes(@Nullable List<MediaType> supportedMediaTypes) {
Assert.notEmpty(supportedMediaTypes, "MediaType List must not be empty");
this.mediaTypes.clear();
if (supportedMediaTypes != null) {
this.mediaTypes.addAll(supportedMediaTypes);
}
this.mediaTypes.addAll(supportedMediaTypes);
}
/**

4
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
View File

@ -57,9 +57,7 @@ public abstract class ViewResolverSupport implements Ordered {
public void setSupportedMediaTypes(@Nullable List<MediaType> supportedMediaTypes) {
Assert.notEmpty(supportedMediaTypes, "MediaType List must not be empty");
this.mediaTypes.clear();
if (supportedMediaTypes != null) {
this.mediaTypes.addAll(supportedMediaTypes);
}
this.mediaTypes.addAll(supportedMediaTypes);
}
/**