Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 25027 invoked from network); 10 Oct 2006 13:34:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Oct 2006 13:34:25 -0000 Received: (qmail 57501 invoked by uid 500); 10 Oct 2006 13:34:25 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 57462 invoked by uid 500); 10 Oct 2006 13:34:24 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 57453 invoked by uid 99); 10 Oct 2006 13:34:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2006 06:34:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2006 06:34:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 21D991A981A; Tue, 10 Oct 2006 06:34:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r454735 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Date: Tue, 10 Oct 2006 13:34:01 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061010133403.21D991A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: stefan Date: Tue Oct 10 06:33:55 2006 New Revision: 454735 URL: http://svn.apache.org/viewvc?view=rev&rev=454735 Log: JCR-586: Removing a mixin that adds a same-name-sibling child node throws an ItemNotFoundException Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&rev=454735&r1=454734&r2=454735 ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Tue Oct 10 06:33:55 2006 @@ -1207,8 +1207,9 @@ } // use temp array to avoid ConcurrentModificationException ArrayList list = new ArrayList(thisState.getChildNodeEntries()); - for (Iterator iter = list.iterator(); iter.hasNext();) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + // start from tail to avoid problems with same-name siblings + for (int i = list.size() - 1; i >= 0; i--) { + NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) list.get(i); NodeImpl node = (NodeImpl) itemMgr.getItem(entry.getId()); // check if node has been defined by mixin type (or one of its supertypes) NodeTypeImpl declaringNT = (NodeTypeImpl) node.getDefinition().getDeclaringNodeType();