Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D6B0E4C9 for ; Wed, 2 Jan 2013 20:40:54 +0000 (UTC) Received: (qmail 99115 invoked by uid 500); 2 Jan 2013 20:40:53 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 99053 invoked by uid 500); 2 Jan 2013 20:40:53 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 99036 invoked by uid 99); 2 Jan 2013 20:40:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 20:40:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 20:40:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EDF62238897A for ; Wed, 2 Jan 2013 20:40:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428015 - /tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java Date: Wed, 02 Jan 2013 20:40:30 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102204030.EDF62238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Jan 2 20:40:30 2013 New Revision: 1428015 URL: http://svn.apache.org/viewvc?rev=1428015&view=rev Log: Commit change missed in r1427851 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java?rev=1428015&r1=1428014&r2=1428015&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java Wed Jan 2 20:40:30 2013 @@ -155,6 +155,9 @@ public final class ForEach implements Ta ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)"); ctxt.generateJavaSource(iterV + "=((Map)" + itemsV + ").entrySet().iterator();"); + // Not null + ctxt.generateJavaSource("if (" + iterV + " != null) {"); + if (hasBegin) { String tV = ctxt.getTemporaryVariableName(); ctxt.generateJavaSource("for (int " + tV + "=" + beginV + ";" + @@ -196,6 +199,7 @@ public final class ForEach implements Ta ctxt.generateJavaSource("break;"); } ctxt.generateJavaSource("}"); // while + ctxt.generateJavaSource("}"); // Not Null } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org