Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 73116 invoked from network); 28 Apr 2005 12:26:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Apr 2005 12:26:30 -0000 Received: (qmail 7609 invoked by uid 500); 28 Apr 2005 12:27:34 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 7591 invoked by uid 500); 28 Apr 2005 12:27:34 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 7583 invoked by uid 99); 28 Apr 2005 12:27:34 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 28 Apr 2005 05:27:34 -0700 Received: (qmail 73100 invoked by uid 65534); 28 Apr 2005 12:26:27 -0000 Message-ID: <20050428122627.73097.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r165131 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Date: Thu, 28 Apr 2005 12:26:27 -0000 To: jackrabbit-cvs@incubator.apache.org From: tripod@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tripod Date: Thu Apr 28 05:26:26 2005 New Revision: 165131 URL: http://svn.apache.org/viewcvs?rev=3D165131&view=3Drev Log: - avoid using zombies for getDepth and isAncestor calculations. Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Hierarch= yManagerImpl.java Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Hi= erarchyManagerImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/HierarchyManagerImpl.java?rev=3D165131&r1=3D165130&r= 2=3D165131&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Hierarch= yManagerImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Hierarch= yManagerImpl.java Thu Apr 28 05:26:26 2005 @@ -389,10 +389,10 @@ throws ItemNotFoundException, RepositoryException { try { int depth =3D 0; - ItemState state =3D getItemState(id, true); + ItemState state =3D getItemState(id, false); String parentUUID =3D state.getParentUUID(); while (parentUUID !=3D null) { - state =3D getItemState(new NodeId(parentUUID), true); + state =3D getItemState(new NodeId(parentUUID), false); parentUUID =3D state.getParentUUID(); depth++; } @@ -414,13 +414,13 @@ public boolean isAncestor(NodeId nodeId, ItemId itemId) throws ItemNotFoundException, RepositoryException { try { - ItemState state =3D getItemState(itemId, true); + ItemState state =3D getItemState(itemId, false); String parentUUID =3D state.getParentUUID(); while (parentUUID !=3D null) { if (parentUUID.equals(nodeId.getUUID())) { return true; } - state =3D getItemState(new NodeId(parentUUID), true); + state =3D getItemState(new NodeId(parentUUID), false); parentUUID =3D state.getParentUUID(); } return false;