Author: mduerig
Date: Mon Jan 27 08:42:22 2014
New Revision: 1561607
URL: http://svn.apache.org/r1561607
Log:
Work around type inference quirk of some Javacs
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=1561607&r1=1561606&r2=1561607&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:42:22 2014
@@ -16,18 +16,17 @@
*/
package org.apache.jackrabbit.oak.plugins.mongomk;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.AbstractMap.SimpleImmutableEntry;
+
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.SortedMap;
+import java.util.TreeMap;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.apache.jackrabbit.oak.plugins.mongomk.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -35,9 +34,9 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Iterators;
import com.google.common.collect.Maps;
import com.google.common.collect.PeekingIterator;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.AbstractMap.SimpleImmutableEntry;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The revision history for a given property. The history may span multiple
@@ -111,7 +110,7 @@ class PropertyHistory implements Iterabl
return new Iterator<NodeDocument>() {
PeekingIterator<Map.Entry<Revision, NodeDocument>> input
= Iterators.peekingIterator(docs.iterator());
- SortedMap<Revision, NodeDocument> queue =
Maps.newTreeMap(StableRevisionComparator.INSTANCE);
+ TreeMap<Revision, NodeDocument> queue =
Maps.newTreeMap(StableRevisionComparator.INSTANCE);
NodeDocument next = fetchNext();
@Override
