svn commit: r1461053 - in /jackrabbit/oak/trunk/oak-mongomk/src: main/java/org/apache/jackrabbit/mongomk/prototype/ test/java/org/apache/jackrabbit/mongomk/prototype/

[mreutegg]

Author: mreutegg
Date: Tue Mar 26 10:40:34 2013
New Revision: 1461053

URL: http://svn.apache.org/r1461053
Log:
OAK-619 Lock-free MongoMK implementation
- work in progress

Modified:
    
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java
    
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/BaseMongoMKTest.java
    
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/MongoMKBranchMergeTest.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=1461053&r1=1461052&r2=1461053&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 10:40:34 2013
@@ -383,8 +383,8 @@ public class MongoMK implements MicroKer
         if (value == null) {
             return false;
         }
-        if (!value.equals("true")) {
-            revision = Revision.fromString(value);
+        if (value.equals("true") && !branchCommits.containsKey(readRevision)) {
+            return true;
         }
         return includeRevision(revision, readRevision);
     }

Modified: 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/BaseMongoMKTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/BaseMongoMKTest.java?rev=1461053&r1=1461052&r2=1461053&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/BaseMongoMKTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/BaseMongoMKTest.java
 Tue Mar 26 10:40:34 2013
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.mongomk.prototype;
 
 import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
-import org.apache.jackrabbit.mongomk.prototype.MongoMK;
 import org.junit.Before;
 
 import com.mongodb.DB;

Modified: 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/MongoMKBranchMergeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/MongoMKBranchMergeTest.java?rev=1461053&r1=1461052&r2=1461053&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/MongoMKBranchMergeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/prototype/MongoMKBranchMergeTest.java
 Tue Mar 26 10:40:34 2013
@@ -230,7 +230,6 @@ public class MongoMKBranchMergeTest exte
     }
 
     @Test
-    @Ignore
     public void twoBranchesAddedChildren1() {
         addNodes(null, "/trunk", "/trunk/child1");
         assertNodesExist(null, "/trunk", "/trunk/child1");