diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/BindingJacksonJsonView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/BindingJacksonJsonView.java index bb5d95f456..0c28d742d4 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/BindingJacksonJsonView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/json/BindingJacksonJsonView.java @@ -136,9 +136,8 @@ public class BindingJacksonJsonView extends AbstractView { */ protected Map filterModel(Map model) { Map result = new HashMap(model.size()); - if (CollectionUtils.isEmpty(renderedAttributes)) { - renderedAttributes = model.keySet(); - } + Set renderedAttributes = + !CollectionUtils.isEmpty(this.renderedAttributes) ? this.renderedAttributes : model.keySet(); for (Map.Entry entry : model.entrySet()) { if (!(entry instanceof BindingResult) && renderedAttributes.contains(entry.getKey())) { result.put(entry.getKey(), entry.getValue());