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
