Author: mreutegg
Date: Wed Sep 20 12:56:55 2017
New Revision: 1809026
URL: http://svn.apache.org/viewvc?rev=1809026&view=rev
Log:
OAK-6685: Background operation may fail when document is malformed
Add Comparator to empty map and enable test
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SplitOperationsTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1809026&r1=1809025&r2=1809026&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Wed Sep 20 12:56:55 2017
@@ -145,7 +145,7 @@ public final class NodeDocument extends
static final int MODIFIED_IN_SECS_RESOLUTION = 5;
private static final NavigableMap<Revision, Range> EMPTY_RANGE_MAP =
- Maps.unmodifiableNavigableMap(new TreeMap<Revision, Range>());
+ Maps.unmodifiableNavigableMap(new TreeMap<Revision,
Range>(REVERSE));
/**
* The list of revision to root commit depth mappings to find out if a
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SplitOperationsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SplitOperationsTest.java?rev=1809026&r1=1809025&r2=1809026&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SplitOperationsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SplitOperationsTest.java
Wed Sep 20 12:56:55 2017
@@ -20,7 +20,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -28,7 +27,6 @@ import static org.apache.jackrabbit.oak.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-@Ignore
public class SplitOperationsTest extends BaseDocumentMKTest {
private static final String ROOT_ID = Utils.getIdFromPath("/");