SPR-7047 - XML MarshallingView assumes non-null value for object to be marshalled.

2010-03-30 08:34:29 +00:00
parent 8c8eca7e05
commit 9cecaa769e
2 changed files with 22 additions and 1 deletions
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
@@ -132,7 +132,7 @@ public class MarshallingView extends AbstractView {
 			return o;
 		}
 		for (Object o : model.values()) {
-			if (this.marshaller.supports(o.getClass())) {
+			if (o != null && this.marshaller.supports(o.getClass())) {
 				return o;
 			}
 		}