Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FD769622 for ; Thu, 2 Feb 2012 14:25:39 +0000 (UTC) Received: (qmail 68198 invoked by uid 500); 2 Feb 2012 14:25:39 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 68092 invoked by uid 500); 2 Feb 2012 14:25:38 -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 68085 invoked by uid 99); 2 Feb 2012 14:25:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 14:25:37 +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; Thu, 02 Feb 2012 14:25:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A85FF2388A29; Thu, 2 Feb 2012 14:25:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239642 - in /jackrabbit/sandbox/microkernel/src: main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Date: Thu, 02 Feb 2012 14:25:13 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120202142513.A85FF2388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Thu Feb 2 14:25:13 2012 New Revision: 1239642 URL: http://svn.apache.org/viewvc?rev=1239642&view=rev Log: fix 'move modified node' Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1239642&r1=1239641&r2=1239642&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java Thu Feb 2 14:25:13 2012 @@ -106,18 +106,18 @@ public class CommitBuilder { if (srcParent.rename(srcNodeName, destNodeName) == null) { throw new NotFoundException(srcPath); } - return; - } - ChildNodeEntry srcCNE = srcParent.remove(srcNodeName); - if (srcCNE == null) { - throw new NotFoundException(srcPath); - } + } else { + ChildNodeEntry srcCNE = srcParent.remove(srcNodeName); + if (srcCNE == null) { + throw new NotFoundException(srcPath); + } - MutableNode destParent = getOrCreateStagedNode(destParentPath); - if (destParent.getChildNodeEntry(destNodeName) != null) { - throw new Exception("node already exists at move destination path: " + destPath); + MutableNode destParent = getOrCreateStagedNode(destParentPath); + if (destParent.getChildNodeEntry(destNodeName) != null) { + throw new Exception("node already exists at move destination path: " + destPath); + } + destParent.add(new ChildNodeEntry(destNodeName, srcCNE.getId())); } - destParent.add(new ChildNodeEntry(destNodeName, srcCNE.getId())); // update staging area moveStagedNodes(srcPath, destPath); Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java?rev=1239642&r1=1239641&r2=1239642&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java (original) +++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Thu Feb 2 14:25:13 2012 @@ -48,6 +48,26 @@ public class MicroKernelTest extends Mul } @Test + public void addAndMove() { + String head = mk.getHeadRevision(); + head = mk.commit("", + "+\"/root\":{}\n" + + "+\"/root/a\":{}\n" + + "", + head, ""); + + head = mk.commit("", + "+\"/root/a/b\":{}\n" + + ">\"/root/a\":\"/root/c\"\n" + + "", + head, ""); + + System.out.println(mk.getNodes("/root", head, 999, 0, -1)); + assertFalse(mk.nodeExists("/root/a", head)); + } + + + @Test public void getNodes() { String head = mk.getHeadRevision();