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 2013/03/26 13:27:51 UTC
svn commit: r1461082 -
/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java
Author: mreutegg
Date: Tue Mar 26 12:27:51 2013
New Revision: 1461082
URL: http://svn.apache.org/r1461082
Log:
OAK-619 Lock-free MongoMK implementation
- respect branches in conflict detection
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java
Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java?rev=1461082&r1=1461081&r2=1461082&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Tue Mar 26 12:27:51 2013
@@ -866,10 +866,10 @@ public class MongoMK implements MicroKer
for (String r : valueMap.keySet()) {
Revision propRev = Revision.fromString(r);
if (newestRev == null || isRevisionNewer(propRev, newestRev)) {
- // TODO check if propRev is really committed, if
- // onlyCommitted is set
if (isRevisionNewer(before, propRev)) {
- newestRev = propRev;
+ if (!onlyCommitted || isValidRevision(propRev, before, nodeMap)) {
+ newestRev = propRev;
+ }
}
}
}