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 2014/01/23 11:59:52 UTC
svn commit: r1560633 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
Author: mreutegg
Date: Thu Jan 23 10:59:51 2014
New Revision: 1560633
URL: http://svn.apache.org/r1560633
Log:
OAK-1352: Remove synchronization on MongoMK.diffImpl()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java?rev=1560633&r1=1560632&r2=1560633&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java Thu Jan 23 10:59:51 2014
@@ -181,7 +181,7 @@ public class MongoMK implements MicroKer
}
}
- synchronized String diffImpl(String fromRevisionId, String toRevisionId, String path,
+ String diffImpl(String fromRevisionId, String toRevisionId, String path,
int depth) throws MicroKernelException {
if (fromRevisionId.equals(toRevisionId)) {
return "";
@@ -212,7 +212,7 @@ public class MongoMK implements MicroKer
if (!fromValue.equals(toValue)) {
w.tag('^').key(p);
if (toValue == null) {
- w.value(toValue);
+ w.value(null);
} else {
w.encodedValue(toValue).newline();
}