You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/05/10 14:02:56 UTC
svn commit: r1743184 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
Author: mreutegg
Date: Tue May 10 14:02:56 2016
New Revision: 1743184
URL: http://svn.apache.org/viewvc?rev=1743184&view=rev
Log:
OAK-4321: Improve conflict exception message to show if conflict is unexpected
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 14:02:56 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737998,1738004,1738775,1738963,1739894,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737998,1738004,1738775,1738963,1739894,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1743184&r1=1743183&r2=1743184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Tue May 10 14:02:56 2016
@@ -42,6 +42,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;
@@ -565,6 +566,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/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java?rev=1743184&r1=1743183&r2=1743184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitTest.java Tue May 10 14:02:56 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);
+ }
+ }
}