Author: mduerig
Date: Thu Dec 19 10:12:10 2013
New Revision: 1552279
URL: http://svn.apache.org/r1552279
Log:
OAK-1297: MoveDetector does not detect moved nodes that have been moved in an
earlier commit already
Properly annotate moved node in the face of moves from earlier commits
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
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=1552279&r1=1552278&r2=1552279&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
Thu Dec 19 10:12:10 2013
@@ -374,9 +374,7 @@ public class MemoryNodeBuilder implement
PropertyState base =
builder.getBaseState().getProperty(MoveDetector.SOURCE_PATH);
PropertyState head =
builder.getNodeState().getProperty(MoveDetector.SOURCE_PATH);
if (Objects.equal(base, head)) {
- if (!builder.hasProperty(MoveDetector.SOURCE_PATH)) {
- builder.setProperty(MoveDetector.SOURCE_PATH, path);
- }
+ builder.setProperty(MoveDetector.SOURCE_PATH, path);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java?rev=1552279&r1=1552278&r2=1552279&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
Thu Dec 19 10:12:10 2013
@@ -32,7 +32,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.DefaultMoveValidator;
import org.apache.jackrabbit.oak.spi.commit.EditorDiff;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class MoveDetectorTest {
@@ -56,7 +55,6 @@ public class MoveDetectorTest {
* @throws CommitFailedException
*/
@Test
- @Ignore("OAK-1297") // FIXME OAK-1297
public void simpleMove() throws CommitFailedException {
NodeState moved1 = move(root.builder(), "/test/x",
"/test/y/xx").getNodeState();
MoveExpectation moveExpectation1 = new MoveExpectation(
