Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 37777200B56 for ; Fri, 15 Jul 2016 15:18:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 35FE5160A8A; Fri, 15 Jul 2016 13:18:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 88640160A6C for ; Fri, 15 Jul 2016 15:18:35 +0200 (CEST) Received: (qmail 32346 invoked by uid 500); 15 Jul 2016 13:18:29 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 31815 invoked by uid 99); 15 Jul 2016 13:18:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 276CBEE686; Fri, 15 Jul 2016 13:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 15 Jul 2016 13:18:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/50] [abbrv] struts git commit: Fix for WW-4312 archived-at: Fri, 15 Jul 2016 13:18:36 -0000 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 Authored: Mon Jan 4 18:03:47 2016 -0400 Committer: Lukasz Lenart 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); }