From 68c0ac014e64206aafd2895a077896f100ac1ffe Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 24 Jun 2009 14:03:10 +0000
Subject: [PATCH] SPR-5853 - JSON formatting view for Spring MVC

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1416 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../web/servlet/view/json/BindingJacksonJsonView.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 bb5d95f4561..0c28d742d4d 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<String, Object> filterModel(Map<String, Object> model) {
 		Map<String, Object> result = new HashMap<String, Object>(model.size());
-		if (CollectionUtils.isEmpty(renderedAttributes)) {
-			renderedAttributes = model.keySet();
-		}
+		Set<String> renderedAttributes =
+				!CollectionUtils.isEmpty(this.renderedAttributes) ? this.renderedAttributes : model.keySet();
 		for (Map.Entry<String, Object> entry : model.entrySet()) {
 			if (!(entry instanceof BindingResult) && renderedAttributes.contains(entry.getKey())) {
 				result.put(entry.getKey(), entry.getValue());