Merge pull request #975 from mreutegg/OAK-9660-1

OAK-9660: NullPointerException When Moving Transient node

oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TransientMoveTest.java

@@ -26,12 +26,12 @@
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.oak.NodeStoreFixtures;
 import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.Parameterized;
 
 import static java.util.Collections.singleton;
 import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.MEMORY_NS;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class TransientMoveTest extends AbstractRepositoryTest {
@@ -45,7 +45,6 @@ public static Collection<Object[]> memoryFixture() {
         return NodeStoreFixtures.asJunitParameters(singleton(MEMORY_NS));
     }
 
-    @Ignore("OAK-9660")
     @Test
     public void transientMove() throws Exception {
         // setup
@@ -91,14 +90,16 @@ public void transientMove() throws Exception {
             // What we really want to do is copy the child, but creating a new node with the same name is sufficient.
             // In the real world, this would have content on it, so all the properties and children would be copied - for testing it doesn't matter.
             // JcrUtil.copy(child, parent, "child", false);
-            parent.addNode(child.getName(), child.getPrimaryNodeType().getName());
+            Node c = parent.addNode(child.getName(), child.getPrimaryNodeType().getName());
 
             assertTrue(session.hasPendingChanges()); // None of these changes have been persisted yet. This is to verify that no auto-saves have occurred.
 
             // Now, we need to actually process the child, so we need to move it so a new node can be created in its place, with the name "child".
             session.move("/var/oak-bug/test/parent/child", "/var/oak-bug/test/parent/tmp-4321"); // NPE On this Call.
 
             session.save();
+
+            assertEquals("/var/oak-bug/test/parent/tmp-4321", c.getPath());
         } finally {
             session.logout();
         }

oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

@@ -443,10 +443,13 @@ private static String getSourcePathAnnotation(MemoryNodeBuilder builder) {
         PropertyState head = builder.getNodeState().getProperty(MoveDetector.SOURCE_PATH);
         if (Objects.equal(base, head)) {
             // Both null: no source path annotation
-            // Both non null but equals: source path annotation is from a previous commit
+            // Both non-null but equals: source path annotation is from a previous commit
             return null;
         } else {
-            return head.getValue(Type.STRING);
+            // OAK-9660: base may have a source path and head does not.
+            // happens when this node had a source path and was transiently
+            // removed and added again (without source path).
+            return head != null ? head.getValue(Type.STRING) : null;
         }
     }