svn commit: r1743172 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java

[mreutegg]

Author: mreutegg
Date: Tue May 10 13:21:14 2016
New Revision: 1743172

URL: http://svn.apache.org/viewvc?rev=1743172&view=rev
Log:
OAK-4321: Improve conflict exception message to show if conflict is unexpected

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1743172&r1=1743171&r2=1743172&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 Tue May 10 13:21:14 2016
@@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Objects.equal;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
@@ -557,6 +558,10 @@ public class Commit {
     private String formatConflictRevision(Revision r) {
         if (nodeStore.getHeadRevision().isRevisionNewer(r)) {
             return r + " (not yet visible)";
+        } else if (baseRevision != null
+                && !baseRevision.isRevisionNewer(r)
+                && !equal(baseRevision.getRevision(r.getClusterId()), r)) {
+            return r + " (older than base " + baseRevision + ")";
         } else {
             return r.toString();
         }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java?rev=1743172&r1=1743171&r2=1743172&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
 Tue May 10 13:21:14 2016
@@ -26,6 +26,8 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class CommitTest {
 
@@ -76,4 +78,35 @@ public class CommitTest {
         b.child("foo");
         ns.merge(b, EmptyHook.INSTANCE, CommitInfo.EMPTY);
     }
+
+    // OAK-4321
+    @Test
+    public void mergeExceptionMessage() throws Exception {
+        // prepare node store
+        DocumentNodeStore ns = builderProvider.newBuilder().getNodeStore();
+        NodeBuilder b = ns.getRoot().builder();
+        b.child("foo");
+        ns.merge(b, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+        b = ns.getRoot().builder();
+        b.child("bar");
+        ns.merge(b, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+        // this commit should fail
+        Commit c = ns.newCommit(ns.getHeadRevision(), null);
+        try {
+            c.addNode(new DocumentNodeState(ns, "/foo",
+                    new RevisionVector(c.getRevision())));
+            try {
+                c.apply();
+                ns.done(c, false, null);
+                fail("commit must fail");
+            } catch (DocumentStoreException e) {
+                // expected
+                assertTrue("Unexpected exception message: " + e.getMessage(),
+                        e.getMessage().contains("older than base"));
+            }
+        } finally {
+            ns.canceled(c);
+        }
+    }
 }