Fix for WW-4312 A problem on Iterator tag
and WW-3010 s:iterator fails to iterate over collections containing null Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fd33dc84 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fd33dc84 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fd33dc84 Branch: refs/heads/master Commit: fd33dc84a674edbeecfc5638995da9a13816dafc Parents: e9bd945 Author: Victor Sosa <victorns...@gmail.com> Authored: Mon Jan 4 18:03:47 2016 -0400 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Jan 19 16:18:00 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/struts2/components/IteratorComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fd33dc84/core/src/main/java/org/apache/struts2/components/IteratorComponent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java index b62424f..1474fe9 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -304,7 +304,7 @@ public class IteratorComponent extends ContextBean { String var = getVar(); - if ((var != null) && (currentValue != null)) { + if ((var != null)) { putInContext(currentValue); }
