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 D909A103F8 for ; Wed, 15 Jan 2014 15:48:11 +0000 (UTC) Received: (qmail 55070 invoked by uid 500); 15 Jan 2014 15:48:11 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 55025 invoked by uid 500); 15 Jan 2014 15:48:11 -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 55017 invoked by uid 99); 15 Jan 2014 15:48:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jan 2014 15:48:11 +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; Wed, 15 Jan 2014 15:48:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1A85D2388860; Wed, 15 Jan 2014 15:47:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1558442 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java oak-jcr/pom.xml Date: Wed, 15 Jan 2014 15:47:50 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140115154750.1A85D2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Jan 15 15:47:49 2014 New Revision: 1558442 URL: http://svn.apache.org/r1558442 Log: OAK-659: Move purge logic for transient changes below the NodeBuilder interface The state in UnconnectedHead can be different from the base state -> fix isModified() to cover that case Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java jackrabbit/oak/trunk/oak-jcr/pom.xml Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1558442&r1=1558441&r2=1558442&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java Wed Jan 15 15:47:49 2014 @@ -29,10 +29,12 @@ import javax.annotation.Nonnull; import com.google.common.base.Objects; import com.google.common.io.ByteStreams; + import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.spi.state.EqualsDiff; import org.apache.jackrabbit.oak.spi.state.MoveDetector; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; @@ -653,7 +655,7 @@ public class MemoryNodeBuilder implement @Override public boolean isModified() { - return false; + return EqualsDiff.modified(base, state); } @Override Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1558442&r1=1558441&r2=1558442&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Jan 15 15:47:49 2014 @@ -64,7 +64,6 @@ org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer2 org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken3 org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenToAnotherSession - org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockWithPendingChanges org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock2