spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 13:31:46 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3187 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma
2010-03-30 08:34:29 +00:00
parent b61dd8b434
commit 16078ccec9
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
+1 -1
View File
@@ -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;
}
}