jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1475794 - /jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
Date Thu, 25 Apr 2013 14:24:28 GMT
Author: mreutegg
Date: Thu Apr 25 14:24:28 2013
New Revision: 1475794

URL: http://svn.apache.org/r1475794
Log:
OAK-619 Lock-free MongoMK implementation
- Temporarily synchronize read/write methods again, otherwise Oak on MongoMK shows some strange
behavior in load tests

Modified:
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java

Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java?rev=1475794&r1=1475793&r2=1475794&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
Thu Apr 25 14:24:28 2013
@@ -769,7 +769,7 @@ public class MongoMK implements MicroKer
     }
 
     @Override
-    public String getNodes(String path, String revisionId, int depth,
+    public synchronized String getNodes(String path, String revisionId, int depth,
             long offset, int maxChildNodes, String filter)
             throws MicroKernelException {
         if (depth != 0) {
@@ -1135,7 +1135,7 @@ public class MongoMK implements MicroKer
     }
 
     @Override
-    public String merge(String branchRevisionId, String message)
+    public synchronized String merge(String branchRevisionId, String message)
             throws MicroKernelException {
         // TODO improve implementation if needed
         if (!branchRevisionId.startsWith("b")) {



Mime
View raw message