Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-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 50D62DB1D for ; Mon, 11 Mar 2013 15:15:01 +0000 (UTC) Received: (qmail 18400 invoked by uid 500); 11 Mar 2013 15:15:01 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 18353 invoked by uid 500); 11 Mar 2013 15:15:00 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 18345 invoked by uid 99); 11 Mar 2013 15:15:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 15:15:00 +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; Mon, 11 Mar 2013 15:14:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AA3342388A33; Mon, 11 Mar 2013 15:14:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1455172 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Date: Mon, 11 Mar 2013 15:14:38 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130311151438.AA3342388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Mon Mar 11 15:14:38 2013 New Revision: 1455172 URL: http://svn.apache.org/r1455172 Log: OAK-691: Error while moving a node if the destination is not connected Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1455172&r1=1455171&r2=1455172&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Mon Mar 11 15:14:38 2013 @@ -440,19 +440,20 @@ public class TreeImpl implements Tree { /** * Move this tree to the parent at {@code destParent} with the new name * {@code destName}. - * * @param destParent new parent for this tree * @param destName new name for this tree */ void moveTo(TreeImpl destParent, String destName) { name = destName; parent = destParent; - if (parent.nodeBuilder.hasChildNode(name)) { - nodeBuilder = parent.nodeBuilder.child(name); - } else { - // make this builder disconnected from its new parent - nodeBuilder = parent.nodeBuilder.child(name); - parent.nodeBuilder.removeNode(name); + if (!parent.isDisconnected()) { + if (parent.nodeBuilder.hasChildNode(name)) { + nodeBuilder = parent.nodeBuilder.child(name); + } else { + // make this builder disconnected from its new parent + nodeBuilder = parent.nodeBuilder.child(name); + parent.nodeBuilder.removeNode(name); + } } }