Author: mreutegg
Date: Mon Jul 14 19:31:02 2014
New Revision: 1610493
URL: http://svn.apache.org/r1610493
Log:
OAK-1967: Avoid collision marker update when already present
Merge revision 1610489 from trunk
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1610489
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1610493&r1=1610492&r2=1610493&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
Mon Jul 14 19:31:02 2014
@@ -127,6 +127,11 @@ class Collision {
if (commitRoot.isCommitted(revision)) {
return false;
}
+ // check if there is already a collision marker
+ if
(commitRoot.getLocalMap(NodeDocument.COLLISIONS).containsKey(revision)) {
+ // already marked
+ return true;
+ }
NodeDocument.addCollision(op, revision);
commitRoot = store.createOrUpdate(Collection.NODES, op);
// check again on old document right before our update was applied
