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 2019/10/03 09:16:00 UTC

svn commit: r1867920 - /jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java

Author: mreutegg
Date: Thu Oct  3 09:16:00 2019
New Revision: 1867920

URL: http://svn.apache.org/viewvc?rev=1867920&view=rev
Log:
OAK-8668: Commit throws exception with incorrect UpdateOp

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

Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1867920&r1=1867919&r2=1867920&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Thu Oct  3 09:16:00 2019
@@ -398,8 +398,8 @@ public class Commit {
                     NodeDocument before = nodeStore.updateCommitRoot(commit, revision);
                     if (before == null) {
                         String msg = "Conflicting concurrent change. " +
-                                "Update operation failed: " + commitRoot;
-                        NodeDocument commitRootDoc = store.find(NODES, commitRoot.getId());
+                                "Update operation failed: " + commit;
+                        NodeDocument commitRootDoc = store.find(NODES, commit.getId());
                         if (commitRootDoc == null) {
                             throw new DocumentStoreException(msg);
                         } else {