Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 64792 invoked from network); 2 Jul 2007 20:55:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jul 2007 20:55:08 -0000 Received: (qmail 40246 invoked by uid 500); 2 Jul 2007 20:55:01 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 40157 invoked by uid 500); 2 Jul 2007 20:55:01 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 40130 invoked by uid 500); 2 Jul 2007 20:55:01 -0000 Received: (qmail 40120 invoked by uid 99); 2 Jul 2007 20:55:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2007 13:55:01 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2007 13:54:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6EA531A981A; Mon, 2 Jul 2007 13:54:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r552593 - /jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java Date: Mon, 02 Jul 2007 20:54:37 -0000 To: commons-cvs@jakarta.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070702205437.6EA531A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbenson Date: Mon Jul 2 13:54:36 2007 New Revision: 552593 URL: http://svn.apache.org/viewvc?view=rev&rev=552593 Log: loc refactor Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java?view=diff&rev=552593&r1=552592&r2=552593 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java Mon Jul 2 13:54:36 2007 @@ -653,23 +653,12 @@ int r = compareNodePointers(p1.parent, depth1 - 1, p2, depth2); return r == 0 ? 1 : r; } - if (p1 == null && p2 == null) { - return 0; - } - - if (p1 != null && p1.equals(p2)) { - return 0; - } - - if (depth1 == 1) { + //henceforth depth1 == depth2: + if (depth1 == 1 || p1 == p2 || p1 != null && p1.equals(p2)) { return 0; } int r = compareNodePointers(p1.parent, depth1 - 1, p2.parent, depth2 - 1); - if (r != 0) { - return r; - } - - return p1.parent.compareChildNodePointers(p1, p2); + return r == 0 ? p1.parent.compareChildNodePointers(p1, p2) : r; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org