Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 45648 invoked from network); 27 Jul 2008 06:00:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jul 2008 06:00:55 -0000 Received: (qmail 25793 invoked by uid 500); 27 Jul 2008 06:00:54 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 25757 invoked by uid 500); 27 Jul 2008 06:00:53 -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 25747 invoked by uid 99); 27 Jul 2008 06:00:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jul 2008 23:00:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 27 Jul 2008 06:00:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0EC1E238899C; Sat, 26 Jul 2008 23:00:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680066 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Date: Sun, 27 Jul 2008 06:00:32 -0000 To: commits@struts.apache.org From: wsmoak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080727060033.0EC1E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wsmoak Date: Sat Jul 26 23:00:31 2008 New Revision: 680066 URL: http://svn.apache.org/viewvc?rev=680066&view=rev Log: [WW-2734] Fix an impossible cast, reported by FindBugs. Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?rev=680066&r1=680065&r2=680066&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java Sat Jul 26 23:00:31 2008 @@ -205,7 +205,7 @@ count = ((Long)countObj).intValue(); } else if (countObj instanceof Double) { - count = ((Long)countObj).intValue(); + count = ((Double)countObj).intValue(); } else if (countObj instanceof String) { try { Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java?rev=680066&r1=680065&r2=680066&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Sat Jul 26 23:00:31 2008 @@ -190,6 +190,14 @@ assertNotSame(topOfStack, afterTopOfStack); } + public void testGeneratorWithDoubleCount() throws Exception { + IteratorGeneratorTag tag = new IteratorGeneratorTag(); + tag.setPageContext(pageContext); + tag.setVal("%{'not used'}"); + tag.setCount("3.0"); + tag.doStartTag(); + tag.doEndTag(); + } public Action getAction() { return new ActionSupport() {