Index: oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java (revision 97bc5c8a7c753537baf730c134e6bc9034a9f0b3) +++ oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java (revision ) @@ -16,6 +16,25 @@ */ package org.apache.jackrabbit.mk.store; +import java.io.Closeable; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.WeakHashMap; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.Weigher; import org.apache.jackrabbit.mk.model.ChildNodeEntries; import org.apache.jackrabbit.mk.model.ChildNodeEntriesMap; import org.apache.jackrabbit.mk.model.ChildNodeEntry; @@ -34,26 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.Weigher; - -import java.io.Closeable; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; -import java.util.WeakHashMap; -import java.util.concurrent.Callable; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantReadWriteLock; - /** * Default revision store implementation, passing calls to a {@code Persistence} * and a {@code BlobStore}, respectively and providing caching. @@ -223,12 +222,12 @@ */ static class PutTokenImpl extends PutToken { - private static int idCounter; + private static final AtomicInteger ID_COUNTER = new AtomicInteger(); private int id; private StoredNode lastModifiedNode; public PutTokenImpl() { - this.id = ++idCounter; + this.id = ID_COUNTER.incrementAndGet(); } @Override Index: oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java (revision 97bc5c8a7c753537baf730c134e6bc9034a9f0b3) +++ oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java (revision ) @@ -200,7 +200,6 @@ } @Test - @Ignore public void putTokenImpl() throws InterruptedException, ExecutionException { final Set tokens = Collections.synchronizedSet(new HashSet()); Set> results = new HashSet>();