Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 8640 invoked from network); 2 May 2008 20:46:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 20:46:57 -0000 Received: (qmail 32768 invoked by uid 500); 2 May 2008 20:46:57 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 32729 invoked by uid 500); 2 May 2008 20:46:57 -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 32718 invoked by uid 99); 2 May 2008 20:46:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 13:46:57 -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; Fri, 02 May 2008 20:46:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 322742388A08; Fri, 2 May 2008 13:46:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652903 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java Date: Fri, 02 May 2008 20:46:33 -0000 To: commits@commons.apache.org From: ebourg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502204633.322742388A08@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ebourg Date: Fri May 2 13:46:32 2008 New Revision: 652903 URL: http://svn.apache.org/viewvc?rev=652903&view=rev Log: Removed a redundant null check in ChildContext Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java?rev=652903&r1=652902&r2=652903&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java Fri May 2 13:46:32 2008 @@ -110,7 +110,7 @@ return; } NodePointer useParent = startFromParentLocation ? parent.getParent() : parent; - iterator = parent == null ? null : useParent.childIterator(nodeTest, - reverse, startFromParentLocation ? parent : null); + iterator = useParent.childIterator(nodeTest, reverse, + startFromParentLocation ? parent : null); } }