Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 86801 invoked from network); 15 Jan 2010 19:22:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2010 19:22:38 -0000 Received: (qmail 73253 invoked by uid 500); 15 Jan 2010 19:22:37 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 73195 invoked by uid 500); 15 Jan 2010 19:22:36 -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 73184 invoked by uid 99); 15 Jan 2010 19:22:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 19:22:36 +0000 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; Fri, 15 Jan 2010 19:22:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5534723889BF; Fri, 15 Jan 2010 19:22:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r899769 - /tomcat/trunk/java/javax/el/ArrayELResolver.java Date: Fri, 15 Jan 2010 19:22:13 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100115192213.5534723889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Jan 15 19:22:12 2010 New Revision: 899769 URL: http://svn.apache.org/viewvc?rev=899769&view=rev Log: Fix TCK failure. Trying to assign an object of the wrong type to an array should throw a ClassCaseException. Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=899769&r1=899768&r2=899769&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ArrayELResolver.java (original) +++ tomcat/trunk/java/javax/el/ArrayELResolver.java Fri Jan 15 19:22:12 2010 @@ -90,6 +90,14 @@ int idx = coerce(property); checkBounds(base, idx); + if (value != null && + !base.getClass().getComponentType().isAssignableFrom( + value.getClass())) { + throw new ClassCastException(message(context, + "objectNotAssignable", + new Object[] {value.getClass().getName(), + base.getClass().getComponentType().getName()})); + } Array.set(base, idx, value); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org