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 B58339A30 for ; Tue, 25 Oct 2011 17:09:17 +0000 (UTC) Received: (qmail 79053 invoked by uid 500); 25 Oct 2011 17:09:17 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 78990 invoked by uid 500); 25 Oct 2011 17:09:17 -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 78983 invoked by uid 99); 25 Oct 2011 17:09:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 17:09:17 +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; Tue, 25 Oct 2011 17:09:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 34CE023888FD for ; Tue, 25 Oct 2011 17:08:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188797 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Date: Tue, 25 Oct 2011 17:08:56 -0000 To: commits@commons.apache.org From: mcucchiara@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025170856.34CE023888FD@eris.apache.org> Author: mcucchiara Date: Tue Oct 25 17:08:55 2011 New Revision: 1188797 URL: http://svn.apache.org/viewvc?rev=1188797&view=rev Log: If statement can be simplified Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.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=1188797&r1=1188796&r2=1188797&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 Tue Oct 25 17:08:55 2011 @@ -2662,15 +2662,11 @@ public class OgnlRuntime return false; } - if ( "true".equals( expression ) || "false".equals( expression ) || "!true".equals( expression ) + return "true".equals( expression ) || "false".equals( expression ) || "!true".equals( expression ) || "!false".equals( expression ) || "(true)".equals( expression ) || "!(true)".equals( expression ) || "(false)".equals( expression ) || "!(false)".equals( expression ) || expression.startsWith( - "org.apache.commons.ognl.OgnlOps" ) ) - { - return true; - } + "org.apache.commons.ognl.OgnlOps" ); - return false; } /**