Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C0767FCF for ; Mon, 7 Nov 2011 09:45:53 +0000 (UTC) Received: (qmail 14264 invoked by uid 500); 7 Nov 2011 09:45:53 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 14211 invoked by uid 500); 7 Nov 2011 09:45:53 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 14204 invoked by uid 99); 7 Nov 2011 09:45:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Nov 2011 09:45: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; Mon, 07 Nov 2011 09:45:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 023C423889D7 for ; Mon, 7 Nov 2011 09:45:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1198678 - in /commons/proper/ognl/trunk/src: main/java/org/apache/commons/ognl/OgnlRuntime.java test/java/org/apache/commons/ognl/TestOgnlRuntime.java Date: Mon, 07 Nov 2011 09:45:31 -0000 To: commits@commons.apache.org From: mcucchiara@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111107094532.023C423889D7@eris.apache.org> Author: mcucchiara Date: Mon Nov 7 09:45:31 2011 New Revision: 1198678 URL: http://svn.apache.org/viewvc?rev=1198678&view=rev Log: Replaced for loop with foreach, added a method test Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1198678&r1=1198677&r2=1198678&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Mon Nov 7 09:45:31 2011 @@ -2031,11 +2031,15 @@ public class OgnlRuntime PropertyDescriptor result = null; PropertyDescriptor[] propertyDescriptors = getPropertyDescriptorsArray( targetClass ); - for ( int i = 0, icount = propertyDescriptors.length; ( result == null ) && ( i < icount ); i++ ) + for ( PropertyDescriptor propertyDescriptor : propertyDescriptors ) { - if ( propertyDescriptors[i].getName().compareTo( name ) == 0 ) + if ( result != null ) { - result = propertyDescriptors[i]; + break; + } + if ( propertyDescriptor.getName().compareTo( name ) == 0 ) + { + result = propertyDescriptor; } } return result; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java?rev=1198678&r1=1198677&r2=1198678&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java Mon Nov 7 09:45:31 2011 @@ -410,4 +410,13 @@ public class TestOgnlRuntime OgnlExpressionCompiler compiler2 = OgnlRuntime.getCompiler( context ); assertSame( "compilers are not the same", compiler1, compiler2 ); } + + @Test + public void testGetPropertyDescriptorFromArray() + throws Exception + { + PropertyDescriptor propertyDescriptor = + OgnlRuntime.getPropertyDescriptorFromArray( Root.class, "disabled" ); + assertEquals( "disabled", propertyDescriptor.getName() ); + } }