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 2015/04/16 17:09:22 UTC
svn commit: r1674089 -
/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Author: mreutegg
Date: Thu Apr 16 15:09:22 2015
New Revision: 1674089
URL: http://svn.apache.org/r1674089
Log:
OAK-2751: Test failures with EnableConcurrentAddRemove feature enabled on 1.0 branch
Revert 1672665, which is not necessary anymore after OAK-2780 fix
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1674089&r1=1674088&r2=1674089&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Thu Apr 16 15:09:22 2015
@@ -477,16 +477,12 @@ public class Commit {
}
String conflictMessage = null;
if (newestRev == null) {
- if ((op.isDelete() || !op.isNew()) &&
- (!nodeStore.getEnableConcurrentAddRemove() || isConflicting(before, op))
- ) {
+ if ((op.isDelete() || !op.isNew()) && isConflicting(before, op)) {
conflictMessage = "The node " +
op.getId() + " does not exist or is already deleted";
}
} else {
- if (op.isNew() &&
- (!nodeStore.getEnableConcurrentAddRemove() || isConflicting(before, op))
- ) {
+ if (op.isNew() && isConflicting(before, op)) {
conflictMessage = "The node " +
op.getId() + " was already added in revision\n" +
newestRev;