Author: thomasm
Date: Mon Jul 1 12:17:13 2013
New Revision: 1498403
URL: http://svn.apache.org/r1498403
Log:
OAK-98 Source code formatting, code conventions, Javadocs
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Collision.java
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/ClusterNodeInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/ClusterNodeInfo.java?rev=1498403&r1=1498402&r2=1498403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/ClusterNodeInfo.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/ClusterNodeInfo.java
Mon Jul 1 12:17:13 2013
@@ -27,7 +27,6 @@ import java.util.UUID;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.util.StringUtils;
-import org.apache.jackrabbit.oak.plugins.mongomk.DocumentStore.Collection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Collision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Collision.java?rev=1498403&r1=1498402&r2=1498403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Collision.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Collision.java
Mon Jul 1 12:17:13 2013
@@ -21,7 +21,6 @@ import java.util.Map;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.oak.plugins.mongomk.DocumentStore.Collection;
import org.apache.jackrabbit.oak.plugins.mongomk.util.Utils;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.slf4j.Logger;
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=1498403&r1=1498402&r2=1498403&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
Mon Jul 1 12:17:13 2013
@@ -67,6 +67,12 @@ import com.mongodb.DB;
*/
public class MongoMK implements MicroKernel {
+ /**
+ * The threshold where special handling for many child node starts.
+ */
+ static final int MANY_CHILDREN_THRESHOLD = Integer.getInteger(
+ "oak.mongoMK.manyChildren", 50);
+
private static final Logger LOG = LoggerFactory.getLogger(MongoMK.class);
/**
@@ -89,12 +95,6 @@ public class MongoMK implements MicroKer
System.getProperty("oak.mongoMK.fastDiff", "true"));
/**
- * The threshold where special handling for many child node starts.
- */
- static final int MANY_CHILDREN_THRESHOLD = Integer.getInteger(
- "oak.mongoMK.manyChildren", 50);
-
- /**
* How long to remember the relative order of old revision of all cluster
* nodes, in milliseconds. The default is one hour.
*/
@@ -792,7 +792,7 @@ public class MongoMK implements MicroKer
}
}
- private synchronized String diffImpl(String fromRevisionId, String
toRevisionId, String path,
+ synchronized String diffImpl(String fromRevisionId, String toRevisionId,
String path,
int depth) throws MicroKernelException {
if (fromRevisionId.equals(toRevisionId)) {
return "";
