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 re...@apache.org on 2019/10/31 08:23:23 UTC
svn commit: r1869203 - in /jackrabbit/oak/branches/1.4/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Author: reschke
Date: Thu Oct 31 08:23:23 2019
New Revision: 1869203
URL: http://svn.apache.org/viewvc?rev=1869203&view=rev
Log:
OAK-8310: Potentially misleading conflict exception message (merged r1859020 into 1.4)
Modified:
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-store-document:r1859020
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=1869203&r1=1869202&r2=1869203&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 Thu Oct 31 08:23:23 2019
@@ -476,7 +476,7 @@ public class Commit {
conflictRevisions.add(newestRev);
if (op.isNew() && !allowConcurrentAddRemove(before, op)) {
conflictMessage = "The node " +
- op.getId() + " was already added in revision\n" +
+ op.getId() + " already existed in revision\n" +
formatConflictRevision(newestRev);
} else if (baseRevision.isRevisionNewer(newestRev)
&& (op.isDelete() || isConflicting(before, op))) {