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 ch...@apache.org on 2014/04/28 12:53:42 UTC
svn commit: r1590596 - in
/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document:
UnsavedModifications.java util/MapFactory.java
Author: chetanm
Date: Mon Apr 28 10:53:42 2014
New Revision: 1590596
URL: http://svn.apache.org/r1590596
Log:
OAK-1772 - Expose an extension point to move in memory state in UnsavedModification to persisted map \nMerging to 1.0
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MapFactory.java
- copied unchanged from r1590595, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MapFactory.java
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java?rev=1590596&r1=1590595&r2=1590596&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java Mon Apr 28 10:53:42 2014
@@ -21,12 +21,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.plugins.document.util.MapFactory;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import com.google.common.base.Function;
@@ -48,7 +49,7 @@ class UnsavedModifications {
*/
static final int BACKGROUND_MULTI_UPDATE_LIMIT = 10000;
- private final ConcurrentHashMap<String, Revision> map = new ConcurrentHashMap<String, Revision>();
+ private final ConcurrentMap<String, Revision> map = MapFactory.getInstance().create();
/**
* Puts a revision for the given path. The revision for the given path is