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 md...@apache.org on 2014/01/27 09:53:07 UTC
svn commit: r1561612 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java
Author: mduerig
Date: Mon Jan 27 08:53:07 2014
New Revision: 1561612
URL: http://svn.apache.org/r1561612
Log:
Work around type inference quirk of some Javacs. 2nd try
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java?rev=1561612&r1=1561611&r2=1561612&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/PropertyHistory.java Mon Jan 27 08:53:07 2014
@@ -32,7 +32,6 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Maps;
import com.google.common.collect.PeekingIterator;
import org.apache.jackrabbit.oak.plugins.mongomk.util.Utils;
import org.slf4j.Logger;
@@ -110,7 +109,8 @@ class PropertyHistory implements Iterabl
return new Iterator<NodeDocument>() {
PeekingIterator<Map.Entry<Revision, NodeDocument>> input
= Iterators.peekingIterator(docs.iterator());
- TreeMap<Revision, NodeDocument> queue = Maps.newTreeMap(StableRevisionComparator.INSTANCE);
+ TreeMap<Revision, NodeDocument> queue =
+ new TreeMap<Revision, NodeDocument>(StableRevisionComparator.INSTANCE);
NodeDocument next = fetchNext();
@Override